From 74b961db77b5d3328f6c1eafde327cd0af23d0d6 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 9 May 2012 16:25:02 +0200 Subject: avconv: replace -vsync cfr code with the fps filter. Invented timestamps for the h264 tests return to something resembling sanity. In the idroq-video-encode test when converting 25 fps -> 30 fps the fifth frame gets duplicated instead of the sixth. --- tests/ref/fate/h264-conformance-cama3_vtc_b | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ref/fate/h264-conformance-cama3_vtc_b') diff --git a/tests/ref/fate/h264-conformance-cama3_vtc_b b/tests/ref/fate/h264-conformance-cama3_vtc_b index 3d912bd2d1..46821c1798 100644 --- a/tests/ref/fate/h264-conformance-cama3_vtc_b +++ b/tests/ref/fate/h264-conformance-cama3_vtc_b @@ -1,5 +1,5 @@ #tb 0: 1/25 -0, 1, 1, 1, 622080, 0xf3f0bf86 -0, 2, 2, 1, 622080, 0x6aaf3d42 -0, 3, 3, 1, 622080, 0xe53bcd5d -0, 4, 4, 1, 622080, 0x8dabca9d +0, 0, 0, 1, 622080, 0xf3f0bf86 +0, 1, 1, 1, 622080, 0x6aaf3d42 +0, 2, 2, 1, 622080, 0xe53bcd5d +0, 3, 3, 1, 622080, 0x8dabca9d -- cgit v1.2.3