Commit 4546bf41 authored by Baptiste Coudurier's avatar Baptiste Coudurier

fix jpeg parser when PARSER_FLAG_COMPLETE_FRAMES is set

Originally committed as revision 19558 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 062394e0
......@@ -78,6 +78,9 @@ static int jpeg_parse(AVCodecParserContext *s,
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(AVCodecParserContext *s,
*poutbuf_size = 0;
return buf_size;
}
}
*poutbuf = buf;
*poutbuf_size = buf_size;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment