har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flacdec: set default sample_fmt before parsing extradata

Browse Source 
Originally committed as revision 16926 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-02-02 01:53:40 +00:00
parent 6bf959fee5
commit faeb2bd41d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/flacdec.c
View File

@ -103,6 +103,8 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
FLACContext *s = avctx->priv_data; FLACContext *s = avctx->priv_data;
s->avctx = avctx; s->avctx = avctx;
avctx->sample_fmt = SAMPLE_FMT_S16;
if (avctx->extradata_size > 4) { if (avctx->extradata_size > 4) {
/* initialize based on the demuxer-supplied streamdata header */ /* initialize based on the demuxer-supplied streamdata header */
if (avctx->extradata_size == FLAC_STREAMINFO_SIZE) { 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; return 0;
} }