Michael Niedermayer 446d62f0cf Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45' ...

* commit '69c25c9284645cf5189af2ede42d6f53828f3b45':
  dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
  x86: h264qpel: Move stray comment to the right spot and clarify it
  atrac3: use correct loop variable in add_tonal_components()

Conflicts:
	tests/ref/vsynth/vsynth1-dnxhd-1080i
	tests/ref/vsynth/vsynth2-dnxhd-1080i

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

2013-01-26 14:33:06 +01:00

..

fate

Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

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

ref

Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'

2013-01-26 14:33:06 +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

…