Michael Niedermayer 39afcf1d7e Merge remote-tracking branch 'qatar/master' ... * qatar/master: eval: add gt(), gte(), lt() and lte() fate tests eval: fix swapping of lt() and lte() imgconvert: deprecate avcodec_find_best_pix_fmt() imgconvert: add avcodec_find_best_pix_fmt2() imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt Conflicts: libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-07-15 01:23:16 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-07-15 01:23:16 +02:00
lavf	ffmpeg: rework checks for the -t option.	2012-07-04 16:20:47 +02:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	sws/x86: add some forgotten 12bit planar yuv cases	2012-07-05 04:38:57 +02:00
seek	vocenc: fix sample rate rounding direction	2012-06-25 03:30:12 +02:00
vsynth1	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00