Michael Niedermayer 446d62f0cf Merge commit '69c25c9284' ... * commit '69c25c9284': 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
..
acodec	lswr: Improve default resampler's default parameters	2013-01-04 16:47:57 +01:00
fate	lavu/eval: extend if/ifnot functions to accept a third parameter	2013-01-24 12:19:01 +01:00
lavf	fate: add an attachment to the Matroska test.	2013-01-26 11:33:09 +01:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	sws: GBRP9, GBRP10 GBRP12 GBRP14 output support	2013-01-26 06:11:52 +01:00
seek	Merge commit 'e6bc38fd49'	2013-01-21 16:07:21 +01:00
vsynth	Merge commit '69c25c9284'	2013-01-26 14:33:06 +01:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00