Fix h264-conformance-frext-frext_mmco4_sony_b conformance test.

This includes a revert of r25840

Originally committed as revision 25842 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 61 insertions, 60 deletions

diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index b861380974..b4bec536a1 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -276,7 +276,7 @@ fate-h264-conformance-frext-frext1_panasonic_c: CMD = framecrc  -i $(SAMPLES)/h2
 fate-h264-conformance-frext-frext2_panasonic_b: CMD = framecrc  -i $(SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0
 fate-h264-conformance-frext-frext3_panasonic_d: CMD = framecrc  -i $(SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
 fate-h264-conformance-frext-frext4_panasonic_a: CMD = framecrc  -i $(SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
-fate-h264-conformance-frext-frext_mmco4_sony_b: CMD = framecrc  -strict 1 -i $(SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
+fate-h264-conformance-frext-frext_mmco4_sony_b: CMD = framecrc  -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
 fate-h264-conformance-frext-hcaff1_hhi_b: CMD = framecrc  -i $(SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264
 fate-h264-conformance-frext-hcafr1_hhi_c: CMD = framecrc  -i $(SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264
 fate-h264-conformance-frext-hcafr2_hhi_a: CMD = framecrc  -i $(SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264
diff --git a/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b b/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
index 6d08a3a2e7..117b48b582 100644
--- a/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
+++ b/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
@@ -1,59 +1,60 @@
-0, 0, 152064, 0xd33945be
-0, 3600, 152064, 0x961cbbfb
-0, 7200, 152064, 0x91eb854d
-0, 10800, 152064, 0x998351b4
-0, 14400, 152064, 0xe7515c67
-0, 18000, 152064, 0xd32058ae
-0, 21600, 152064, 0x99cb5695
-0, 25200, 152064, 0x281de175
-0, 28800, 152064, 0xf4146f55
-0, 32400, 152064, 0x63abbb61
-0, 36000, 152064, 0xf44550c5
-0, 39600, 152064, 0x5797a5c2
-0, 43200, 152064, 0x13b15c60
-0, 46800, 152064, 0x6521e682
-0, 50400, 152064, 0x780c32a4
-0, 54000, 152064, 0x6289f37c
-0, 57600, 152064, 0x96d64d81
-0, 61200, 152064, 0x12ac80ef
-0, 64800, 152064, 0x470956e4
-0, 68400, 152064, 0x3954f944
-0, 72000, 152064, 0x2147f0db
-0, 75600, 152064, 0xca7c9a39
-0, 79200, 152064, 0x727e7772
-0, 82800, 152064, 0xb3b0f8c8
-0, 86400, 152064, 0x6d6eb7ba
-0, 90000, 152064, 0x1eaf5734
-0, 93600, 152064, 0xd7938056
-0, 97200, 152064, 0xcae1ead3
-0, 100800, 152064, 0x6411b82c
-0, 104400, 152064, 0x6f001718
-0, 108000, 152064, 0x3724d9b8
-0, 111600, 152064, 0x04501fec
-0, 115200, 152064, 0x3f4d13bb
-0, 118800, 152064, 0x38f2510a
-0, 122400, 152064, 0x5bb71106
-0, 126000, 152064, 0xe888b09d
-0, 129600, 152064, 0xca6f5f6a
-0, 133200, 152064, 0x01c7d329
-0, 136800, 152064, 0x4e670932
-0, 140400, 152064, 0x651b4984
-0, 144000, 152064, 0x76371fa3
-0, 147600, 152064, 0x60574af0
-0, 151200, 152064, 0xcc1f2080
-0, 154800, 152064, 0xdbf29eb6
-0, 158400, 152064, 0x8ff870be
-0, 162000, 152064, 0x5d39ea56
-0, 165600, 152064, 0xabb7c0a5
-0, 169200, 152064, 0xecb15771
-0, 172800, 152064, 0x571ab1ae
-0, 176400, 152064, 0xc0f22bad
-0, 180000, 152064, 0x22e7593f
-0, 183600, 152064, 0x3c3dee75
-0, 187200, 152064, 0x1c80b995
-0, 190800, 152064, 0x5ba442fa
-0, 194400, 152064, 0xe2291c05
-0, 198000, 152064, 0xa780b11e
-0, 201600, 152064, 0x15bf83fa
-0, 205200, 152064, 0x60fb7c11
-0, 208800, 152064, 0x3fb8cee5
+0, 0, 152064, 0x24846654
+0, 3600, 152064, 0xd33945be
+0, 7200, 152064, 0x961cbbfb
+0, 10800, 152064, 0x91eb854d
+0, 14400, 152064, 0x998351b4
+0, 18000, 152064, 0xe7515c67
+0, 21600, 152064, 0xd32058ae
+0, 25200, 152064, 0x99cb5695
+0, 28800, 152064, 0x281de175
+0, 32400, 152064, 0xf4146f55
+0, 36000, 152064, 0x63abbb61
+0, 39600, 152064, 0xf44550c5
+0, 43200, 152064, 0x5797a5c2
+0, 46800, 152064, 0x13b15c60
+0, 50400, 152064, 0x6521e682
+0, 54000, 152064, 0x780c32a4
+0, 57600, 152064, 0x6289f37c
+0, 61200, 152064, 0x96d64d81
+0, 64800, 152064, 0x12ac80ef
+0, 68400, 152064, 0x470956e4
+0, 72000, 152064, 0x3954f944
+0, 75600, 152064, 0x2147f0db
+0, 79200, 152064, 0xca7c9a39
+0, 82800, 152064, 0x727e7772
+0, 86400, 152064, 0xb3b0f8c8
+0, 90000, 152064, 0x6d6eb7ba
+0, 93600, 152064, 0x1eaf5734
+0, 97200, 152064, 0xd7938056
+0, 100800, 152064, 0xcae1ead3
+0, 104400, 152064, 0x6411b82c
+0, 108000, 152064, 0x6f001718
+0, 111600, 152064, 0x3724d9b8
+0, 115200, 152064, 0x04501fec
+0, 118800, 152064, 0x3f4d13bb
+0, 122400, 152064, 0x38f2510a
+0, 126000, 152064, 0x5bb71106
+0, 129600, 152064, 0xe888b09d
+0, 133200, 152064, 0xca6f5f6a
+0, 136800, 152064, 0x01c7d329
+0, 140400, 152064, 0x4e670932
+0, 144000, 152064, 0x651b4984
+0, 147600, 152064, 0x76371fa3
+0, 151200, 152064, 0x60574af0
+0, 154800, 152064, 0xcc1f2080
+0, 158400, 152064, 0xdbf29eb6
+0, 162000, 152064, 0x8ff870be
+0, 165600, 152064, 0x5d39ea56
+0, 169200, 152064, 0xabb7c0a5
+0, 172800, 152064, 0xecb15771
+0, 176400, 152064, 0x571ab1ae
+0, 180000, 152064, 0xc0f22bad
+0, 183600, 152064, 0x22e7593f
+0, 187200, 152064, 0x3c3dee75
+0, 190800, 152064, 0x1c80b995
+0, 194400, 152064, 0x5ba442fa
+0, 198000, 152064, 0xe2291c05
+0, 201600, 152064, 0xa780b11e
+0, 205200, 152064, 0x15bf83fa
+0, 208800, 152064, 0x60fb7c11
+0, 212400, 152064, 0x3fb8cee5