diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 20:22:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 20:22:56 +0200 |
| commit | 43c18fec6e7cee336b5cf3ea5b0c6503410d6b73 (patch) | |
| tree | 78c7ba64d87fe903e90734b6f2a4a388201bb88b /libavformat/riffenc.c | |
| parent | f78bc96b7c1c74caf99a7139cf81ce1110404965 (diff) | |
| parent | 584f88409062f7a134e7391887899e8e723ab6ff (diff) | |
| download | ffmpeg-43c18fec6e7cee336b5cf3ea5b0c6503410d6b73.tar.gz | |
Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'
* commit '584f88409062f7a134e7391887899e8e723ab6ff':
riff: Pass block_align to estimate frame duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riffenc.c')
| -rw-r--r-- | libavformat/riffenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 66c0ff29d6..9cdf301f26 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -67,7 +67,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags) /* 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. */ - frame_size = av_get_audio_frame_duration(enc, 0); + frame_size = av_get_audio_frame_duration(enc, enc->block_align); if (!frame_size) frame_size = enc->frame_size; |