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/yuv4mpegenc.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/yuv4mpegenc.c')
| -rw-r--r-- | libavformat/yuv4mpegenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/yuv4mpegenc.c b/libavformat/yuv4mpegenc.c index 3836a95402..beae8bba65 100644 --- a/libavformat/yuv4mpegenc.c +++ b/libavformat/yuv4mpegenc.c @@ -38,8 +38,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) width = st->codec->width; height = st->codec->height; - av_reduce(&raten, &rated, st->codec->time_base.den, - st->codec->time_base.num, (1UL << 31) - 1); + // TODO: should be avg_frame_rate + av_reduce(&raten, &rated, st->time_base.den, + st->time_base.num, (1UL << 31) - 1); aspectn = st->sample_aspect_ratio.num; aspectd = st->sample_aspect_ratio.den; |