diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-11-07 22:35:00 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-11-07 22:35:00 +0000 |
| commit | 1a15ab492090de959dd2025b16a64411b39910b6 (patch) | |
| tree | 387c8edf28321989f5daf8bb43b26df432ad014e | |
| parent | f3001e0deeacbfb0966b5d59bb1e0318f0eee4fc (diff) | |
| download | ffmpeg-1a15ab492090de959dd2025b16a64411b39910b6.tar.gz | |
Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.
Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/soxdec.c | 1 | ||||
| -rw-r--r-- | libavformat/tmv.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c index f6389caec9..59c0278ce2 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 fe38113ceb..27afbbfa6d 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 * |