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

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 446ccb9..a7ba016 100644 (file)
--- 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