Michael Niedermayer 94ecbe23c5 Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a' ...

* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
	libavformat/au.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

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

2012-12-18 14:27:59 +01:00

..

fate

Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'

2012-12-18 14:27:59 +01:00

ref

mjpegenc: fix 444 block count so it is below 10

2012-12-16 15:05:31 +01:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-12-05 17:33:12 +01:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

IRCAM demuxer & muxer

2012-12-05 13:01:22 +00:00

lavfi-regression.sh

fate: add hue filter test.

2012-12-02 14:44:26 +01:00

lena.pnm

…

Makefile

fate: check if rsync has the contimeout option

2012-12-15 01:33:19 +01:00

md5.sh

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

utils.c

…

videogen.c

…