Michael Niedermayer f9fd6f983b Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410' ...

* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
  lavc: make up a fake frame channel layout when there is no real one.

Conflicts:
	libavcodec/utils.c

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

2013-03-12 12:49:59 +01:00

..

fate

ffmpeg: port sub2video to AVFrame.

2013-03-10 13:45:15 +01:00

ref

Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'

2013-03-12 12:49:59 +01:00

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

2013-01-22 14:09:59 +01:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

fate: add an attachment to the Matroska test.

2013-01-26 11:33:09 +01:00

lavfi-regression.sh

tests: add overlay rgb and yuv444 tests

2013-03-05 13:20:13 +01:00

lena.pnm

…

Makefile

fate: add animated gif decoder tests

2013-02-24 19:27:26 +00: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

…