Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / h263_parser.c

diff --git a/libavcodec/h263_parser.c b/libavcodec/h263_parser.c
index e08198324b812ce64a54ac505a43b9faef786697..a3d24ea433a79be6d56c414fd2c9176dbeb2bb4d 100644 (file)
--- a/libavcodec/h263_parser.c
+++ b/libavcodec/h263_parser.c
@@ -70,12 +70,16 @@ static int h263_parse(AVCodecParserContext *s,
     ParseContext *pc = s->priv_data;
     int next;
 
-    next= ff_h263_find_frame_end(pc, buf, buf_size);
+    if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
+        next = buf_size;
+    } else {
+        next= ff_h263_find_frame_end(pc, buf, buf_size);
 
-    if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
-        *poutbuf = NULL;
-        *poutbuf_size = 0;
-        return buf_size;
+        if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
+            *poutbuf = NULL;
+            *poutbuf_size = 0;
+            return buf_size;
+        }
     }
 
     *poutbuf = buf;