Michael Niedermayer 0b74fd1134 Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa' ...

* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa':
  nuv: do not rely on get_buffer() initializing the frame.
  yop: initialize palette to 0

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg-fh
	tests/ref/fate/yop

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

2013-02-06 16:40:59 +01:00

..

fate

Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

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

ref

Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'

2013-02-06 16:40: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

…

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

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

utils.c

…

videogen.c

…