diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 00:32:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 00:32:31 +0200 |
| commit | 86e107a7d468666189506d3edd4f4b5ca14cd59e (patch) | |
| tree | 7270750bbe78c241461a844d7c1c8de3696e3765 /libavcodec/flacdec.c | |
| parent | af392efe51d5cc3536cb3c75bce8954179222d18 (diff) | |
| parent | 1a068bfefd5da09f596e5079b39b418933bad0ea (diff) | |
| download | ffmpeg-86e107a7d468666189506d3edd4f4b5ca14cd59e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Consistently use C-style comments with multiple inclusion guards
anm: fix a few Doxygen comments
misc typo and wording fixes
attributes: add av_noreturn
attributes: drop pointless define guards
configure: do not disable av_always_inline with --enable-small
flvdec: initial stream switch support
avplay: fix write on freed memory for rawvideo
snow: remove a VLA used for edge emulation
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
snow: remove the runs[] VLA.
snow: Check mallocs at init
flacdec: remove redundant setting of avctx->sample_fmt
Conflicts:
ffplay.c
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavformat/flvdec.c
libavutil/attributes.h
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 82c4e807dd..02ed463eb3 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -108,8 +108,6 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) FLACContext *s = avctx->priv_data; s->avctx = avctx; - avctx->sample_fmt = AV_SAMPLE_FMT_S16; - /* for now, the raw FLAC header is allowed to be passed to the decoder as frame data instead of extradata. */ if (!avctx->extradata) |