Michael Niedermayer a845ac78c9 Merge commit '2cd4068071b9a8908823a3107f97e938211045ce' ...

* commit '2cd4068071b9a8908823a3107f97e938211045ce':
  fraps: fix off-by one bug for version 1.

Conflicts:
	libavcodec/fraps.c

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

2013-02-06 15:21:39 +01:00

..

fate

Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

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

ref

Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'

2013-02-06 15:21:39 +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

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

lena.pnm

…

Makefile

fate: add sub2video test.

2013-01-02 17:53:12 +01: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