RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186' 

* commit '9f1eccb97bf8894cb18b14f642500686505ef186':
  ff_parse_specific_params: do not use AVCodecContext.frame_size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-01 15:52:18 +01:00
parent 53448461a7 9f1eccb97b
commit 29e6606e9b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/riffenc.c
View File

@ -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) {