Michael Niedermayer 93f244e3ab Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95' ...

* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
  avformat: Fix references to the removed function av_write_header in comments
  changelog: Mention the MSVC DLL support
  fate: add dependencies for misc microsoft codecs
  fate-twinvq: add dependencies
  fate-mpc: add dependencies
  fate-indeo: add dependencies
  fate-als: add dependencies
  fate: dependencies for demux tests

Conflicts:
	Changelog
	tests/Makefile
	tests/fate/demux.mak
	tests/fate/microsoft.mak
	tests/fate/mpc.mak
	tests/fate/vqf.mak

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

2012-10-19 13:47:47 +02:00

..

fate

Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

2012-10-19 13:47:47 +02:00

ref

idcinvideo: if decoding fails return error

2012-10-19 00:08:01 +00:00

asynth1.sw

…

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02: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 faststart regression test.

2012-09-27 08:59:37 +02:00

lavfi-regression.sh

fate: add vf_idet filter to lavfi regression tests

2012-10-11 02:21:28 +02:00

lena.pnm

…

Makefile

Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

2012-10-19 13:47:47 +02:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

regression-funcs.sh

fate: remove unused functions

2012-05-30 05:57:56 +02:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00

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

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00