diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 18:18:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 19:49:17 +0200 |
| commit | ac293b66851f6c4461eab03ca91af59d5ee4e02e (patch) | |
| tree | 4bcf9e474aaec1e346c368660b52e4630059e380 /libavformat/riffenc.c | |
| parent | 88514378bac99872265dad28072fb30160b26bfa (diff) | |
| parent | 194be1f43ea391eb986732707435176e579265aa (diff) | |
| download | ffmpeg-ac293b66851f6c4461eab03ca91af59d5ee4e02e.tar.gz | |
Merge commit '194be1f43ea391eb986732707435176e579265aa'
* commit '194be1f43ea391eb986732707435176e579265aa':
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riffenc.c')
| -rw-r--r-- | libavformat/riffenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index edb8b4ce44..ef4d399030 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -255,8 +255,8 @@ void ff_parse_specific_params(AVStream *st, int *au_rate, } else if (codec->codec_type == AVMEDIA_TYPE_VIDEO || codec->codec_type == AVMEDIA_TYPE_DATA || codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { - *au_scale = codec->time_base.num; - *au_rate = codec->time_base.den; + *au_scale = st->time_base.num; + *au_rate = st->time_base.den; } else { *au_scale = codec->block_align ? codec->block_align * 8 : 8; *au_rate = codec->bit_rate ? codec->bit_rate : |