Browse Source

fix jpeg parser when PARSER_FLAG_COMPLETE_FRAMES is set

Originally committed as revision 19558 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Baptiste Coudurier 16 years ago
parent
commit
4546bf4116
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/mjpeg_parser.c

+ 4
- 0
libavcodec/mjpeg_parser.c View File

@@ -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;


Loading…
Cancel
Save