On 2012-11-28 18:18:20 +0100, Diego Biurrun wrote: > --- > tests/fate/ea.mak | 12 +- > tests/fate/h264.mak | 354 +++++++++++++++++++++++++------------------------- > 2 files changed, 183 insertions(+), 183 deletions(-) > > diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak > index f4a1a45..d333042 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_AVCONV-$(call DEMDEC, EA, EACMV) += fate-ea-cmv > fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 > > -FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq > -fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an > - > -FATE_SAMPLES_AVCONV-$(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_AVCONV-$(call DEMDEC, EA, EAMAD) += fate-ea-mad > fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an > > +FATE_SAMPLES_AVCONV-$(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 > > @@ -21,3 +18,6 @@ fate-ea-tgv-2: CMD = framecrc -i > $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -a > > FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV) > fate-ea-tgv: $(FATE_EA_TGV) > + > +FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATQI) += fate-ea-tqi > +fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve > -frames:v 26 -an
ok > diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak > index 6f330b5..1948cf0 100644 > --- a/tests/fate/h264.mak > +++ b/tests/fate/h264.mak > @@ -172,8 +172,8 @@ FATE_H264 = aud_mw_e > \ > sva_nl2_e \ > > FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ > - fate-h264-lossless \ > fate-h264-extreme-plane-pred \ > + fate-h264-lossless \ ok > FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264) > FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-interlace-crop > @@ -184,180 +184,180 @@ FATE_H264-$(CONFIG_H264_MP4TOANNEXB_BSF) += > $(FATE_H264_BSF-yes) > FATE_SAMPLES_AVCONV += $(FATE_H264-yes) > fate-h264: $(FATE_H264-yes) > > -fate-h264-conformance-aud_mw_e: CMD = framecrc -i > $(SAMPLES)/h264-conformance/AUD_MW_E.264 > -fate-h264-conformance-ba1_ft_c: CMD = framecrc -i > $(SAMPLES)/h264-conformance/BA1_FT_C.264 > -fate-h264-conformance-ba1_sony_d: CMD = framecrc -i > $(SAMPLES)/h264-conformance/BA1_Sony_D.jsv [...] this hunk is ok assuming you've verified that git diff -b is empty Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
