flacdec: set default sample_fmt before parsing extradata

Originally committed as revision 16926 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 49b4577..d8ba07b 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -103,6 +103,8 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
     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(AVCodecContext *avctx)
         }
     }
 
-    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }