[FFmpeg-cvslog] r19558 - trunk/libavcodec/mjpeg_parser.c

[bcoudurier]

Author: bcoudurier
Date: Sun Aug  2 10:46:11 2009
New Revision: 19558

Log:
fix jpeg parser when PARSER_FLAG_COMPLETE_FRAMES is set

Modified:
   trunk/libavcodec/mjpeg_parser.c

Modified: trunk/libavcodec/mjpeg_parser.c
==============================================================================
--- trunk/libavcodec/mjpeg_parser.c	Fri Jul 31 09:40:35 2009	(r19557)
+++ trunk/libavcodec/mjpeg_parser.c	Sun Aug  2 10:46:11 2009	(r19558)
@@ -78,6 +78,9 @@ static int jpeg_parse(AVCodecParserConte
     ParseContext *pc = s->priv_data;
     int next;
 
+    if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
+        next= buf_size;
+    }else{
     next= find_frame_end(pc, buf, buf_size);
 
     if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
@@ -85,6 +88,7 @@ static int jpeg_parse(AVCodecParserConte
         *poutbuf_size = 0;
         return buf_size;
     }
+    }
 
     *poutbuf = buf;
     *poutbuf_size = buf_size;