diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:18:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:31:34 +0200 |
| commit | 5142963b7d93fd96f0e5b10a7cf2312825af87dc (patch) | |
| tree | f7898f4c6994103c40f152e4d28ec5d77881065e /tests/fate | |
| parent | 17e6d7b4008fa499892716cd095a364a42a3fba8 (diff) | |
| parent | f91fe24e9bd6912c29bbb03d8afe878e045f9721 (diff) | |
| download | ffmpeg-streaming-5142963b7d93fd96f0e5b10a7cf2312825af87dc.zip ffmpeg-streaming-5142963b7d93fd96f0e5b10a7cf2312825af87dc.tar.gz | |
Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'
* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
g2meet: force simple idct for identical results over all fate configs
Conflicts:
tests/ref/fate/g2m3
tests/ref/fate/g2m4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/screen.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 5507a04..1865441 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -30,13 +30,13 @@ FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS) fate-fraps: $(FATE_FRAPS) FATE_G2M += fate-g2m2 -fate-g2m2: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an +fate-g2m2: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an FATE_G2M += fate-g2m3 -fate-g2m3: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20 +fate-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20 FATE_G2M += fate-g2m4 -fate-g2m4: CMD = framecrc -i $(TARGET_SAMPLES)/g2m/g2m4.asf +fate-g2m4: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m4.asf FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M) fate-g2m: $(FATE_G2M) |
