Browse Source

flacdec: set default sample_fmt before parsing extradata

Originally committed as revision 16926 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Justin Ruggles 16 years ago
parent
commit
faeb2bd41d
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/flacdec.c

+ 2
- 1
libavcodec/flacdec.c View File

@@ -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;
}



Loading…
Cancel
Save