[FFmpeg-cvslog] r14278 - trunk/libavcodec/flac.c

[michael]

Author: michael
Date: Fri Jul 18 13:08:15 2008
New Revision: 14278

Log:
If metadata has been parsed goto end instead of trying to
decorrelate and output somehing nonexistng.


Modified:
   trunk/libavcodec/flac.c

Modified: trunk/libavcodec/flac.c
==============================================================================
--- trunk/libavcodec/flac.c	(original)
+++ trunk/libavcodec/flac.c	Fri Jul 18 13:08:15 2008
@@ -632,8 +632,9 @@ static int flac_decode_frame(AVCodecCont
 
     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(AVCodecCont
             s->bitstream_index=0;
             return -1;
         }
-    }
 
 
 #if 0