[SCM] libav/experimental: Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1a15ab492090de959dd2025b16a64411b39910b6
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sat Nov 7 22:35:00 2009 +0000

    Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.
    
    Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index f6389ca..59c0278 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -107,7 +107,6 @@ static int sox_read_header(AVFormatContext *s,
     url_fskip(pb, header_size - SOX_FIXED_HDR - comment_size);
 
     st->codec->sample_rate           = sample_rate;
-    st->codec->sample_fmt            = SAMPLE_FMT_S32;
     st->codec->bits_per_coded_sample = 32;
     st->codec->bit_rate              = st->codec->sample_rate *
                                        st->codec->bits_per_coded_sample *
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index fe38113..27afbbf 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -111,7 +111,6 @@ static int tmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     ast->codec->codec_type            = CODEC_TYPE_AUDIO;
     ast->codec->codec_id              = CODEC_ID_PCM_U8;
-    ast->codec->sample_fmt            = SAMPLE_FMT_U8;
     ast->codec->channels              = features & TMV_STEREO ? 2 : 1;
     ast->codec->bits_per_coded_sample = 8;
     ast->codec->bit_rate              = ast->codec->sample_rate *

-- 
Libav/FFmpeg packaging