From c09ed33e186ea0ba4ab96599bd69aea462aabeda Mon Sep 17 00:00:00 2001 From: Bartlomiej Wolowiec Date: Mon, 7 Apr 2008 20:54:08 +0000 Subject: Corrections of errors in aac_ac3_parser Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac_ac3_parser.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libavcodec/aac_ac3_parser.c') diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index e920b7f88c..a1284f7518 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -44,13 +44,19 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, if((len=s->sync(s->state, s, &s->need_next_header, &s->new_frame_start))) break; } - i-= s->header_size; + i-= s->header_size -1; if(len>0){ s->remaining_size = len + i; if(pc->index+i > 0 && s->new_frame_start){ s->remaining_size -= i; // remaining_size=len output_frame: + if(!s->frame_in_buffer && 0){ + s->frame_in_buffer=1; + buf+=i; + buf_size-=i; + continue; + } ff_combine_frame(pc, i, &buf, &buf_size); *poutbuf = buf; *poutbuf_size = buf_size; @@ -72,6 +78,7 @@ output_frame: return i; } + s->frame_in_buffer=1; }else{ break; } -- cgit v1.2.3