diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-12-10 12:40:05 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-12-10 22:02:44 +0100 |
| commit | e745d7525a21731a871318daff972608c1aeceec (patch) | |
| tree | 5996bcb484ef75ed700f6785ba17aead07b24508 | |
| parent | 489a7b07e9c4df1bea04a4d428a9c5a44c07f883 (diff) | |
| download | ffmpeg-e745d7525a21731a871318daff972608c1aeceec.tar.gz | |
rawdec: don't set codec timebase.
It's not supposed to be set outside of lavc. Set r_frame_rate and
avg_frame_rate instead.
| -rw-r--r-- | libavformat/rawdec.c | 2 | ||||
| -rw-r--r-- | tests/ref/fate/h264-lossless | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 81dd8b49e5..589cdd5db9 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -159,7 +159,7 @@ int ff_raw_video_read_header(AVFormatContext *s, goto fail; } - st->codec->time_base = (AVRational){framerate.den, framerate.num}; + st->r_frame_rate = st->avg_frame_rate = framerate; avpriv_set_pts_info(st, 64, 1, 1200000); fail: diff --git a/tests/ref/fate/h264-lossless b/tests/ref/fate/h264-lossless index c6659ca830..30a70b5118 100644 --- a/tests/ref/fate/h264-lossless +++ b/tests/ref/fate/h264-lossless @@ -1,10 +1,10 @@ 0, 0, 460800, 0x7731dd2f -0, 1500, 460800, 0x944b8c64 -0, 3000, 460800, 0xbe833041 -0, 4500, 460800, 0xbe95d96a -0, 6000, 460800, 0xfe7ea5e6 -0, 7500, 460800, 0x381743c7 -0, 9000, 460800, 0x63fcc2e9 -0, 10500, 460800, 0x79574960 -0, 12000, 460800, 0xdab9e18a -0, 13500, 460800, 0xd88e8fe8 +0, 3600, 460800, 0x944b8c64 +0, 7200, 460800, 0xbe833041 +0, 10800, 460800, 0xbe95d96a +0, 14400, 460800, 0xfe7ea5e6 +0, 18000, 460800, 0x381743c7 +0, 21600, 460800, 0x63fcc2e9 +0, 25200, 460800, 0x79574960 +0, 28800, 460800, 0xdab9e18a +0, 32400, 460800, 0xd88e8fe8 |