diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 15:52:18 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 15:52:18 +0100 |
| commit | 29e6606e9b42aa811be995e2fcdea4806911bc9f (patch) | |
| tree | b3ac08cfc0763b40551128ecf82c9714f2ab61be /libavformat | |
| parent | 53448461a7720afab0d1f1234af79573fd2e020d (diff) | |
| parent | 9f1eccb97bf8894cb18b14f642500686505ef186 (diff) | |
| download | ffmpeg-29e6606e9b42aa811be995e2fcdea4806911bc9f.tar.gz | |
Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186'
* commit '9f1eccb97bf8894cb18b14f642500686505ef186':
ff_parse_specific_params: do not use AVCodecContext.frame_size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riffenc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index ceb27f272c..250cf41ae7 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -242,12 +242,7 @@ void ff_parse_specific_params(AVStream *st, int *au_rate, int gcd; int audio_frame_size; - /* We use the known constant frame size for the codec if known, otherwise - * fall back on using AVCodecContext.frame_size, which is not as reliable - * for indicating packet duration. */ audio_frame_size = av_get_audio_frame_duration(codec, 0); - if (!audio_frame_size) - audio_frame_size = codec->frame_size; *au_ssize = codec->block_align; if (audio_frame_size && codec->sample_rate) { |