aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-05-05 13:46:50 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-05-05 13:46:50 +0000
commit266c1d901f1b9a5a10cf9046dc2a011217184f7f (patch)
tree1a0692f4e07e1a70bf0ffd60c6f1ba73f9319fdd /libavcodec
parent3cb088868c4c2efd44b9bad595db48fbeb2c96a0 (diff)
downloadffmpeg-266c1d901f1b9a5a10cf9046dc2a011217184f7f.tar.gz
Do not discard mp3 frames in the parser after a broken frame.
Fixes issue1044. This may cause regressions with broken streams, if you find any, please report! Originally committed as revision 18741 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegaudio_parser.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 47a78df5b0..cc2d240abd 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -223,10 +223,8 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
if(s->frame_size > 0 && buf_ptr - buf == s->inbuf_ptr - s->inbuf
&& buf_size + buf_ptr - buf >= s->frame_size){
- if(s->header_count > 0){
*poutbuf = buf;
*poutbuf_size = s->frame_size;
- }
buf_ptr = buf + s->frame_size;
s->inbuf_ptr = s->inbuf;
s->frame_size = 0;
@@ -236,10 +234,8 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
// next_data:
if (s->frame_size > 0 &&
(s->inbuf_ptr - s->inbuf) >= s->frame_size) {
- if(s->header_count > 0){
*poutbuf = s->inbuf;
*poutbuf_size = s->inbuf_ptr - s->inbuf;
- }
s->inbuf_ptr = s->inbuf;
s->frame_size = 0;
break;