mirror of https://git.ffmpeg.org/ffmpeg.git
Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.
Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f3001e0dee
commit
1a15ab4920
|
@ -107,7 +107,6 @@ static int sox_read_header(AVFormatContext *s,
|
||||||
url_fskip(pb, header_size - SOX_FIXED_HDR - comment_size);
|
url_fskip(pb, header_size - SOX_FIXED_HDR - comment_size);
|
||||||
|
|
||||||
st->codec->sample_rate = sample_rate;
|
st->codec->sample_rate = sample_rate;
|
||||||
st->codec->sample_fmt = SAMPLE_FMT_S32;
|
|
||||||
st->codec->bits_per_coded_sample = 32;
|
st->codec->bits_per_coded_sample = 32;
|
||||||
st->codec->bit_rate = st->codec->sample_rate *
|
st->codec->bit_rate = st->codec->sample_rate *
|
||||||
st->codec->bits_per_coded_sample *
|
st->codec->bits_per_coded_sample *
|
||||||
|
|
|
@ -111,7 +111,6 @@ static int tmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||||
|
|
||||||
ast->codec->codec_type = CODEC_TYPE_AUDIO;
|
ast->codec->codec_type = CODEC_TYPE_AUDIO;
|
||||||
ast->codec->codec_id = CODEC_ID_PCM_U8;
|
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->channels = features & TMV_STEREO ? 2 : 1;
|
||||||
ast->codec->bits_per_coded_sample = 8;
|
ast->codec->bits_per_coded_sample = 8;
|
||||||
ast->codec->bit_rate = ast->codec->sample_rate *
|
ast->codec->bit_rate = ast->codec->sample_rate *
|
||||||
|
|
Loading…
Reference in New Issue