flacdec: set default sample_fmt before parsing extradata

Originally committed as revision 16926 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · faeb2bd41d
parent 6bf959fee5
commit faeb2bd41d
1 changed files with 2 additions and 1 deletions
--- 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;
 }