[FFmpeg-cvslog] r16926 - trunk/libavcodec/flacdec.c

[jbr]

Author: jbr
Date: Mon Feb  2 02:53:40 2009
New Revision: 16926

Log:
flacdec: set default sample_fmt before parsing extradata

Modified:
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Mon Feb  2 01:35:25 2009	(r16925)
+++ trunk/libavcodec/flacdec.c	Mon Feb  2 02:53:40 2009	(r16926)
@@ -103,6 +103,8 @@ static av_cold int flac_decode_init(AVCo
     FLACContext *s = avctx->priv_data;
     s->avctx = avctx;
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
+
     if (avctx->extradata_size > 4) {
         /* initialize based on the demuxer-supplied streamdata header */
         if (avctx->extradata_size == FLAC_STREAMINFO_SIZE) {
@@ -115,7 +117,6 @@ static av_cold int flac_decode_init(AVCo
         }
     }
 
-    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }