Michael Niedermayer 575399c7e1 Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d' ...

* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
	doc/APIchanges
	tests/fate/h264.mak

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

2013-04-25 09:54:11 +02:00

..

fate

Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'

2013-04-25 09:54:11 +02:00

filtergraphs

Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

2013-04-11 02:10:12 +02:00

ref

Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'

2013-04-25 09:54:11 +02:00

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

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

base64.c

…

copycooker.sh

…

fate-run.sh

fate: Print correct error message for reference generation too

2013-03-30 11:41:58 +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/gif: create meaningful gif encoding tests.

2013-04-19 02:05:01 +02:00

lavfi-regression.sh

lavfi/aspect: switch to an AVOptions-based system.

2013-04-11 22:05:03 +02:00

lena.pnm

…

Makefile

Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'

2013-04-19 23:26:55 +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

tiny_ssim.c

tests/tiny_ssim: include the 2 macros instead of a header

2013-03-27 01:38:18 +01:00

utils.c

…

videogen.c

Merge remote-tracking branch 'qatar/master'

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