Michael Niedermayer a201639a01 Merge remote-tracking branch 'qatar/master' ... * qatar/master: pixfmt: support more yuva formats swscale: support gray to 9bit and 10bit formats configure: rewrite print_config() function using awk FATE: fix (AD)PCM test dependencies broken in e519990 Use ptrdiff_t instead of int for intra pred "stride" function parameter. x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes. Conflicts: libavcodec/h264pred.c libavcodec/h264pred_template.c libavutil/pixfmt.h libswscale/swscale_unscaled.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-30 17:47:36 +01:00
..
fate	ffmpeg: use av_rescale_delta() on the audio filter input	2012-10-27 00:26:35 +02:00
lavf	ffmpeg: use av_rescale_delta() on the audio filter input	2012-10-27 00:26:35 +02:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	Merge remote-tracking branch 'qatar/master'	2012-10-30 17:47:36 +01:00
seek	Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'	2012-10-17 15:16:23 +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