[SCM] libav/experimental: Allow decoders to correctly set the sample format by defaulting to SAMPLE_FMT_NONE in avcodec_get_context_defaults2.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0bf095a8372427e603af7853c45b29547ced8653
Author: Jai Menon <jmenon86 at gmail.com>
Date:   Thu Nov 26 20:46:13 2009 +0000

    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

diff --git a/libavcodec/options.c b/libavcodec/options.c
index ded294e..fa64294 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;

-- 
Libav/FFmpeg packaging