Michael Niedermayer a5b2b22d9a Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b' ...

* commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b':
  txd: Use the TextureDSP module for decoding

Conflicts:
	configure
	libavcodec/s3tc.c
	libavcodec/s3tc.h
	libavcodec/txd.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-22 21:15:50 +02:00

..

fate

Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'

2015-06-22 21:15:50 +02:00

filtergraphs

…

ref

Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'

2015-06-22 21:15:50 +02:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

fate: Test pullup and fieldmatch with 5 instead of 1 frame

2015-05-12 12:29:47 +02:00

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

…

Makefile

…

md5.sh

…

reference.pnm

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

tiny_ssim.c

…

utils.c

…

videogen.c

…