Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.
authorJustin Ruggles <justin.ruggles@gmail.com>
Sat, 7 Nov 2009 22:35:00 +0000 (22:35 +0000)
committerJustin Ruggles <justin.ruggles@gmail.com>
Sat, 7 Nov 2009 22:35:00 +0000 (22:35 +0000)
Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/soxdec.c
libavformat/tmv.c

index f6389caec91cf311d64a7de412e064655e8f776c..59c0278ce261460d0b7da6d0497dfc84d4b104db 100644 (file)
@@ -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 *
index fe38113cebefc0a658132112b83767062717bb51..27afbbfa6d336e2ab94ca1dc412e04d67f994005 100644 (file)
@@ -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 *