From 2b4b8c824e9d49800185b8f04fa5de6ce4bde07b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 18 Jul 2008 11:08:15 +0000 Subject: [PATCH] If metadata has been parsed goto end instead of trying to decorrelate and output somehing nonexistng. Originally committed as revision 14278 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/flac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 446ccb949b..a7ba01606e 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -632,8 +632,9 @@ static int flac_decode_frame(AVCodecContext *avctx, init_get_bits(&s->gb, buf, buf_size*8); - if (!metadata_parse(s)) - { + if(metadata_parse(s)) + goto end; + tmp = show_bits(&s->gb, 16); if((tmp & 0xFFFE) != 0xFFF8){ av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n"); @@ -648,7 +649,6 @@ static int flac_decode_frame(AVCodecContext *avctx, s->bitstream_index=0; return -1; } - } #if 0