ffmpeg/tests
Michael Niedermayer 99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
..
fate Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
ref pixdesc: fix broken yuva definitions 2012-12-05 01:04:45 +00:00
audiogen.c
base64.c
copycooker.sh
fate-run.sh Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6' 2012-12-03 02:33:27 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh AST Muxer 2012-12-04 11:25:46 +00:00
lavfi-regression.sh fate: add hue filter test. 2012-12-02 14:44:26 +01:00
lena.pnm
Makefile Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 2012-11-29 14:16:46 +01:00
md5.sh Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
regression-funcs.sh
rotozoom.c
test.ffmeta fate/ffprobe: add some stream metadata. 2012-10-08 11:03:27 +02:00
tiny_psnr.c Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
utils.c
videogen.c