[FFmpeg-cvslog] avcodec/dpx_parser: reset index when finding a startcode, not after

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 17:08:53 2014 +0200| [f518fb33184b35b0cc5eb9354bbeb39a548ea41e] | committer: Michael Niedermayer

avcodec/dpx_parser: reset index when finding a startcode, not after

This is simpler

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f518fb33184b35b0cc5eb9354bbeb39a548ea41e
---

 libavcodec/dpx_parser.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/dpx_parser.c b/libavcodec/dpx_parser.c
index 70baaf4..6c6d502 100644
--- a/libavcodec/dpx_parser.c
+++ b/libavcodec/dpx_parser.c
@@ -57,6 +57,7 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx,
                 state == MKTAG('S','D','P','X')) {
                 d->pc.frame_start_found = 1;
                 d->is_be = state == MKBETAG('S','D','P','X');
+                d->index = 0;
                 break;
             }
         }
@@ -73,27 +74,26 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx,
 
     for (;d->pc.frame_start_found && i < buf_size; i++) {
         d->pc.state = (d->pc.state << 8) | buf[i];
-        if (d->index == 16) {
+        d->index++;
+        if (d->index == 17) {
             d->fsize = d->is_be ? d->pc.state : av_bswap32(d->pc.state);
             if (d->fsize <= 1664) {
-                d->index = d->pc.frame_start_found = 0;
+                d->pc.frame_start_found = 0;
                 goto flush;
             }
-            d->index = 0;
             if (d->fsize > buf_size - i + 19)
                 d->remaining_size = d->fsize - buf_size + i - 19;
             else
                 next = d->fsize + i - 19;
             break;
         }
-        d->index++;
     }
 
 flush:
     if (ff_combine_frame(&d->pc, next, &buf, &buf_size) < 0)
         return buf_size;
 
-    d->index = d->pc.frame_start_found = 0;
+    d->pc.frame_start_found = 0;
 
     *poutbuf      = buf;
     *poutbuf_size = buf_size;