Michael Niedermayer 7e944159c6 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (25 commits) vcr1: Add vcr1_ prefixes to all static functions with generic names. vcr1: Fix return type of common_init to match the function pointer signature. vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits. motion-test: remove disabled code gxfenc: remove disabled half-implemented MJPEG tag x86: use more standard construct for setting ASM functions in FFT code fate: westwood-aud: disable decoding fate: caf: disable decoding fate: film-cvid: drop pcm audio and rename test fate: d-cinema-demux: drop unnecessary flags fate: split off dpcm-interplay from interplay-mve tests fate: rename funcom-iss to adpcm-ima-iss fate: rename cryo-apc to adpcm-ima-apc fate: rename adpcm-psx-str-v3 to adpcm-xa fate: split off adpcm-ms-mono test from dxa-feeble fate: split off adpcm-ima-ws test from vqa-cc fate: add adpcm-ima-smjpeg test fate: split off adpcm-ima-amv from amv test fate: separate bmv audio and video tests fate: separate delphine-cin audio and video tests ... Conflicts: doc/platform.texi libavcodec/vcr1.c tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak tests/ref/fate/ea-mad-pcm-planar tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mtv tests/ref/fate/qtrle-1bit tests/ref/fate/qtrle-2bit tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/vqa-cc Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-05-14 20:17:24 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-05-14 20:17:24 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2012-05-14 20:17:24 +02:00
asynth1.sw
audiogen.c	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
base64.c
codec-regression.sh	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
copycooker.sh
fate_config.sh.template
fate-run.sh	ffprobe: add "noprint_wrappers" option to default writer	2012-05-14 12:59:51 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-04-25 23:17:41 +02:00
lavfi-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-04-14 22:37:43 +02:00
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2012-05-10 02:25:41 +02:00
md5.sh
regression-funcs.sh	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
rotozoom.c	Merge remote-tracking branch 'qatar/master'	2012-05-05 20:22:09 +02:00
tiny_psnr.c	tiny_psnr: reindent after last commit.	2012-04-15 15:46:46 +02:00
utils.c	Merge remote-tracking branch 'qatar/master'	2012-05-06 21:53:19 +02:00
videogen.c	Merge remote-tracking branch 'qatar/master'	2012-05-05 20:22:09 +02:00