diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 00:56:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 00:56:33 +0200 |
| commit | 7d1918affee4bc70fb8ac139ba9235e7fed2979b (patch) | |
| tree | b8c1beadf98aceeee6a155ae83bfc110656ca595 /libavformat/flvenc.c | |
| parent | 316f6df9cc5a70c5b117793c9f167c4ce629c1e0 (diff) | |
| parent | 41f43202cf7648522b4ce0ed7bbb326655dbb9bc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flvdec: remove spurious use of stream id
lavf: deprecate r_frame_rate.
lavf: round estimated average fps to a "standard" fps.
Conflicts:
ffmpeg.c
ffprobe.c
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/flvdec.c
libavformat/rawdec.c
libavformat/utils.c
tests/ref/fate/iv8-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
| -rw-r--r-- | libavformat/flvenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 610c3fc720..c6a676a2db 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -205,9 +205,9 @@ static int flv_write_header(AVFormatContext *s) FLVStreamContext *sc; switch (enc->codec_type) { case AVMEDIA_TYPE_VIDEO: - if (s->streams[i]->r_frame_rate.den && - s->streams[i]->r_frame_rate.num) { - framerate = av_q2d(s->streams[i]->r_frame_rate); + if (s->streams[i]->avg_frame_rate.den && + s->streams[i]->avg_frame_rate.num) { + framerate = av_q2d(s->streams[i]->avg_frame_rate); } else { framerate = 1 / av_q2d(s->streams[i]->codec->time_base); } |