Michael Niedermayer 2c5a2958e9 Merge remote-tracking branch 'qatar/master' ... * qatar/master: h264: Factorize declaration of mb_sizes array. vsrc_buffer: when no frame is available, return an error instead of segfaulting. configure: add dl to frei0r extralibs. dsputil x86: use SSE float instruction instead of SSE2 integer equivalent dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype vp8dsp x86: perform rounding shift with a single instruction fate: add BMP tests. swscale: handle complete dimensions for monoblack/white. aacenc: Mark deinterleave_input_samples argument as const. vf_unsharp: Mark readonly variable as const. h264: fix 4:2:2 PCM-macroblocks decoding Conflicts: configure libavcodec/h264.h libavcodec/x86/dsputil_mmx.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-05 22:26:50 +02:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-03-22 00:40:11 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2012-04-05 22:26:50 +02:00
lavf	asfenc: properly write index information	2012-04-05 06:03:10 +02:00
lavf-fate	lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple.	2012-02-18 21:45:07 +01:00
lavfi	lavfi/colormatrix: add forgotten tests.	2012-04-05 07:32:45 +02:00
seek	asfenc: properly write index information	2012-04-05 06:03:10 +02:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2012-03-15 01:27:10 +01:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2012-03-15 01:27:10 +01:00