From 0bf095a8372427e603af7853c45b29547ced8653 Mon Sep 17 00:00:00 2001 From: Jai Menon Date: Thu, 26 Nov 2009 20:46:13 +0000 Subject: [PATCH] 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 --- libavcodec/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;