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/vc1testenc.c | |
| parent | 316f6df9cc5a70c5b117793c9f167c4ce629c1e0 (diff) | |
| parent | 41f43202cf7648522b4ce0ed7bbb326655dbb9bc (diff) | |
| download | ffmpeg-7d1918affee4bc70fb8ac139ba9235e7fed2979b.tar.gz | |
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/vc1testenc.c')
| -rw-r--r-- | libavformat/vc1testenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c index 10b7b64819..56c723c729 100644 --- a/libavformat/vc1testenc.c +++ b/libavformat/vc1testenc.c @@ -44,8 +44,8 @@ static int vc1test_write_header(AVFormatContext *s) avio_wl24(pb, 0); // hrd_buffer avio_w8(pb, 0x80); // level|cbr|res1 avio_wl32(pb, 0); // hrd_rate - if (s->streams[0]->r_frame_rate.den && s->streams[0]->r_frame_rate.num == 1) - avio_wl32(pb, s->streams[0]->r_frame_rate.den); + if (s->streams[0]->avg_frame_rate.den && s->streams[0]->avg_frame_rate.num == 1) + avio_wl32(pb, s->streams[0]->avg_frame_rate.den); else avio_wl32(pb, 0xFFFFFFFF); //variable framerate avpriv_set_pts_info(s->streams[0], 32, 1, 1000); |