Просмотр исходного кода

Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.

Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk
Justin Ruggles 15 лет назад
Родитель
Сommit
1a15ab4920
2 измененных файлов с 0 добавлено и 2 удалено
  1. 0 1
      libavformat/soxdec.c
  2. 0 1
      libavformat/tmv.c

+ 0 - 1
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 *

+ 0 - 1
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 *