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/rmenc.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/rmenc.c')
| -rw-r--r-- | libavformat/rmenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 17192ff275..2e50ed338c 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -315,6 +315,8 @@ static int rm_write_header(AVFormatContext *s) } for(n=0;n<s->nb_streams;n++) { + AVStream *st = s->streams[n]; + s->streams[n]->id = n; codec = s->streams[n]->codec; stream = &rm->streams[n]; @@ -334,7 +336,8 @@ static int rm_write_header(AVFormatContext *s) break; case AVMEDIA_TYPE_VIDEO: rm->video_stream = stream; - stream->frame_rate = (float)codec->time_base.den / (float)codec->time_base.num; + // TODO: should be avg_frame_rate + stream->frame_rate = (float)st->time_base.den / (float)st->time_base.num; /* XXX: dummy values */ stream->packet_max_size = 4096; stream->nb_packets = 0; |