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.

1 files changed, 90 insertions, 90 deletions

diff --git a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
index 0253e1a781..fd0911bb5f 100644
--- a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
@@ -1,91 +1,91 @@
 #tb 0: 1/25
-0,          2,          2,        1,   152064, 0x128cd77a
-0,          3,          3,        1,   152064, 0x565b9fc1
-0,          5,          5,        1,   152064, 0xbe322679
-0,          7,          7,        1,   152064, 0x0ea4238f
-0,          9,          9,        1,   152064, 0x1e08fb3c
-0,         11,         11,        1,   152064, 0x6da3a93c
-0,         13,         13,        1,   152064, 0x75e5b181
-0,         14,         14,        1,   152064, 0xa0b39334
-0,         15,         15,        1,   152064, 0xa0d10d6d
-0,         16,         16,        1,   152064, 0x33842bcb
-0,         17,         17,        1,   152064, 0x9a74e1e4
-0,         18,         18,        1,   152064, 0xc2037244
-0,         19,         19,        1,   152064, 0x364b8ae4
-0,         20,         20,        1,   152064, 0x18c04971
-0,         22,         22,        1,   152064, 0x7234ecb5
-0,         23,         23,        1,   152064, 0x3719f8bc
-0,         25,         25,        1,   152064, 0x1285ead1
-0,         26,         26,        1,   152064, 0xd3bfab18
-0,         28,         28,        1,   152064, 0x898111e2
-0,         30,         30,        1,   152064, 0x681c15fc
-0,         31,         31,        1,   152064, 0x8e501572
-0,         33,         33,        1,   152064, 0xd7c838be
-0,         35,         35,        1,   152064, 0xede424b2
-0,         36,         36,        1,   152064, 0xcfc20240
-0,         38,         38,        1,   152064, 0x13992e86
-0,         40,         40,        1,   152064, 0x56fb251a
-0,         41,         41,        1,   152064, 0xee9be320
-0,         42,         42,        1,   152064, 0xea650153
-0,         44,         44,        1,   152064, 0x2cb6dabe
-0,         45,         45,        1,   152064, 0xf44fa4b5
-0,         47,         47,        1,   152064, 0xdac2adff
-0,         48,         48,        1,   152064, 0x9e15a1dc
-0,         50,         50,        1,   152064, 0x28d00970
-0,         51,         51,        1,   152064, 0xe4277347
-0,         52,         52,        1,   152064, 0xebd25ad1
-0,         53,         53,        1,   152064, 0x029402da
-0,         55,         55,        1,   152064, 0x1a2311ef
-0,         56,         56,        1,   152064, 0xb86bf96a
-0,         57,         57,        1,   152064, 0x67d7a5b0
-0,         59,         59,        1,   152064, 0x573abc2d
-0,         60,         60,        1,   152064, 0xbe97dec0
-0,         61,         61,        1,   152064, 0x592b91a4
-0,         63,         63,        1,   152064, 0x9adda65e
-0,         64,         64,        1,   152064, 0x0354b2cb
-0,         65,         65,        1,   152064, 0x91e27ff9
-0,         66,         66,        1,   152064, 0x389f8625
-0,         68,         68,        1,   152064, 0x90175850
-0,         69,         69,        1,   152064, 0x2d36c427
-0,         71,         71,        1,   152064, 0xc0dd14ab
-0,         73,         73,        1,   152064, 0xd49bf131
-0,         74,         74,        1,   152064, 0x0d4a9b92
-0,         75,         75,        1,   152064, 0xae9bb2f1
-0,         76,         76,        1,   152064, 0x36847ade
-0,         77,         77,        1,   152064, 0x74810382
-0,         78,         78,        1,   152064, 0xc56d1d9f
-0,         79,         79,        1,   152064, 0xcfefe3ae
-0,         81,         81,        1,   152064, 0xeaa39353
-0,         83,         83,        1,   152064, 0x14289aef
-0,         84,         84,        1,   152064, 0x74ba8f3b
-0,         86,         86,        1,   152064, 0xdcaa518d
-0,         88,         88,        1,   152064, 0x6e4881c2
-0,         90,         90,        1,   152064, 0xa4db767d
-0,         92,         92,        1,   152064, 0x239b0b19
-0,         94,         94,        1,   152064, 0x5d054236
-0,         96,         96,        1,   152064, 0x6f392d7c
-0,         98,         98,        1,   152064, 0x5c2af146
-0,        100,        100,        1,   152064, 0x26b439af
-0,        102,        102,        1,   152064, 0xba7043ab
-0,        103,        103,        1,   152064, 0x0816000c
-0,        105,        105,        1,   152064, 0x3a713c05
-0,        106,        106,        1,   152064, 0xb3111f6d
-0,        108,        108,        1,   152064, 0xdbf8dae2
-0,        110,        110,        1,   152064, 0x09ddf22e
-0,        112,        112,        1,   152064, 0x8871fa7e
-0,        113,        113,        1,   152064, 0x9f5db7a1
-0,        114,        114,        1,   152064, 0xcc38f225
-0,        116,        116,        1,   152064, 0xa1d18df9
-0,        117,        117,        1,   152064, 0x9b1c5d6a
-0,        118,        118,        1,   152064, 0x9f2bc696
-0,        120,        120,        1,   152064, 0xc39bd11a
-0,        122,        122,        1,   152064, 0x4ceca7d0
-0,        124,        124,        1,   152064, 0x63a60f1d
-0,        126,        126,        1,   152064, 0x4cd31f28
-0,        128,        128,        1,   152064, 0x9c9af5d1
-0,        130,        130,        1,   152064, 0x6def65fc
-0,        131,        131,        1,   152064, 0x1011466d
-0,        133,        133,        1,   152064, 0xfeca406d
-0,        135,        135,        1,   152064, 0xd1ca8a1e
-0,        136,        136,        1,   152064, 0x30caa195
-0,        137,        137,        1,   152064, 0x31a09a48
+0,          0,          0,        1,   152064, 0x128cd77a
+0,          1,          1,        1,   152064, 0x565b9fc1
+0,          2,          2,        1,   152064, 0xbe322679
+0,          3,          3,        1,   152064, 0x0ea4238f
+0,          4,          4,        1,   152064, 0x1e08fb3c
+0,          5,          5,        1,   152064, 0x6da3a93c
+0,          6,          6,        1,   152064, 0x75e5b181
+0,          7,          7,        1,   152064, 0xa0b39334
+0,          8,          8,        1,   152064, 0xa0d10d6d
+0,          9,          9,        1,   152064, 0x33842bcb
+0,         10,         10,        1,   152064, 0x9a74e1e4
+0,         11,         11,        1,   152064, 0xc2037244
+0,         12,         12,        1,   152064, 0x364b8ae4
+0,         13,         13,        1,   152064, 0x18c04971
+0,         14,         14,        1,   152064, 0x7234ecb5
+0,         15,         15,        1,   152064, 0x3719f8bc
+0,         16,         16,        1,   152064, 0x1285ead1
+0,         17,         17,        1,   152064, 0xd3bfab18
+0,         18,         18,        1,   152064, 0x898111e2
+0,         19,         19,        1,   152064, 0x681c15fc
+0,         20,         20,        1,   152064, 0x8e501572
+0,         21,         21,        1,   152064, 0xd7c838be
+0,         22,         22,        1,   152064, 0xede424b2
+0,         23,         23,        1,   152064, 0xcfc20240
+0,         24,         24,        1,   152064, 0x13992e86
+0,         25,         25,        1,   152064, 0x56fb251a
+0,         26,         26,        1,   152064, 0xee9be320
+0,         27,         27,        1,   152064, 0xea650153
+0,         28,         28,        1,   152064, 0x2cb6dabe
+0,         29,         29,        1,   152064, 0xf44fa4b5
+0,         30,         30,        1,   152064, 0xdac2adff
+0,         31,         31,        1,   152064, 0x9e15a1dc
+0,         32,         32,        1,   152064, 0x28d00970
+0,         33,         33,        1,   152064, 0xe4277347
+0,         34,         34,        1,   152064, 0xebd25ad1
+0,         35,         35,        1,   152064, 0x029402da
+0,         36,         36,        1,   152064, 0x1a2311ef
+0,         37,         37,        1,   152064, 0xb86bf96a
+0,         38,         38,        1,   152064, 0x67d7a5b0
+0,         39,         39,        1,   152064, 0x573abc2d
+0,         40,         40,        1,   152064, 0xbe97dec0
+0,         41,         41,        1,   152064, 0x592b91a4
+0,         42,         42,        1,   152064, 0x9adda65e
+0,         43,         43,        1,   152064, 0x0354b2cb
+0,         44,         44,        1,   152064, 0x91e27ff9
+0,         45,         45,        1,   152064, 0x389f8625
+0,         46,         46,        1,   152064, 0x90175850
+0,         47,         47,        1,   152064, 0x2d36c427
+0,         48,         48,        1,   152064, 0xc0dd14ab
+0,         49,         49,        1,   152064, 0xd49bf131
+0,         50,         50,        1,   152064, 0x0d4a9b92
+0,         51,         51,        1,   152064, 0xae9bb2f1
+0,         52,         52,        1,   152064, 0x36847ade
+0,         53,         53,        1,   152064, 0x74810382
+0,         54,         54,        1,   152064, 0xc56d1d9f
+0,         55,         55,        1,   152064, 0xcfefe3ae
+0,         56,         56,        1,   152064, 0xeaa39353
+0,         57,         57,        1,   152064, 0x14289aef
+0,         58,         58,        1,   152064, 0x74ba8f3b
+0,         59,         59,        1,   152064, 0xdcaa518d
+0,         60,         60,        1,   152064, 0x6e4881c2
+0,         61,         61,        1,   152064, 0xa4db767d
+0,         62,         62,        1,   152064, 0x239b0b19
+0,         63,         63,        1,   152064, 0x5d054236
+0,         64,         64,        1,   152064, 0x6f392d7c
+0,         65,         65,        1,   152064, 0x5c2af146
+0,         66,         66,        1,   152064, 0x26b439af
+0,         67,         67,        1,   152064, 0xba7043ab
+0,         68,         68,        1,   152064, 0x0816000c
+0,         69,         69,        1,   152064, 0x3a713c05
+0,         70,         70,        1,   152064, 0xb3111f6d
+0,         71,         71,        1,   152064, 0xdbf8dae2
+0,         72,         72,        1,   152064, 0x09ddf22e
+0,         73,         73,        1,   152064, 0x8871fa7e
+0,         74,         74,        1,   152064, 0x9f5db7a1
+0,         75,         75,        1,   152064, 0xcc38f225
+0,         76,         76,        1,   152064, 0xa1d18df9
+0,         77,         77,        1,   152064, 0x9b1c5d6a
+0,         78,         78,        1,   152064, 0x9f2bc696
+0,         79,         79,        1,   152064, 0xc39bd11a
+0,         80,         80,        1,   152064, 0x4ceca7d0
+0,         81,         81,        1,   152064, 0x63a60f1d
+0,         82,         82,        1,   152064, 0x4cd31f28
+0,         83,         83,        1,   152064, 0x9c9af5d1
+0,         84,         84,        1,   152064, 0x6def65fc
+0,         85,         85,        1,   152064, 0x1011466d
+0,         86,         86,        1,   152064, 0xfeca406d
+0,         87,         87,        1,   152064, 0xd1ca8a1e
+0,         88,         88,        1,   152064, 0x30caa195
+0,         89,         89,        1,   152064, 0x31a09a48