aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJai Menon <jmenon86@gmail.com>2009-11-26 20:46:13 +0000
committerJai Menon <jmenon86@gmail.com>2009-11-26 20:46:13 +0000
commit0bf095a8372427e603af7853c45b29547ced8653 (patch)
tree50ea876d8a65cbac2664237fe597cfe71696e3e2
parent14b903f3897be8258d48f46de8255ae8af2acf98 (diff)
downloadffmpeg-0bf095a8372427e603af7853c45b29547ced8653.tar.gz
Allow decoders to correctly set the sample format by defaulting to
SAMPLE_FMT_NONE in avcodec_get_context_defaults2. Originally committed as revision 20623 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index ded294e1bd..fa64294a0d 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -437,7 +437,7 @@ void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType codec_type)
s->execute2= avcodec_default_execute2;
s->sample_aspect_ratio= (AVRational){0,1};
s->pix_fmt= PIX_FMT_NONE;
- s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
+ s->sample_fmt= SAMPLE_FMT_NONE;
s->palctrl = NULL;
s->reget_buffer= avcodec_default_reget_buffer;