diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 14:23:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 14:23:22 +0100 |
| commit | dacd6202ec50d122fcb7e9e92cdd014444cd2a98 (patch) | |
| tree | 0c9ceb86ced0b85eb1b1eccfc7346060b69a2b37 /tests/fate/ea.mak | |
| parent | 765debf51f1aee58b6748e575082ecd30033b323 (diff) | |
| parent | 1944d532a8a1c4b12222f0acfeb1153630dbc996 (diff) | |
| download | ffmpeg-dacd6202ec50d122fcb7e9e92cdd014444cd2a98.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: always use pic for shared libraries
build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
fate: ea, h264: prettyprinting and ordering cosmetics
Conflicts:
tests/fate/ea.mak
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/ea.mak')
| -rw-r--r-- | tests/fate/ea.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak index eb757085d7..81e14b858b 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -4,15 +4,12 @@ fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be9 FATE_SAMPLES_EA-$(call DEMDEC, EA, EACMV) += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq -fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an - -FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi -fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an - FATE_SAMPLES_EA-$(call DEMDEC, EA, EAMAD) += fate-ea-mad fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an +FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq +fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an + FATE_EA_TGV += fate-ea-tgv-1 fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an @@ -22,5 +19,8 @@ fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -a FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV) fate-ea-tgv: $(FATE_EA_TGV) +FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi +fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an + FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA-yes) fate-ea: $(FATE_SAMPLES_EA-yes) |