ffmpeg/libavfilter
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
..
2011-12-27 15:21:08 +01:00
2011-12-04 21:13:22 +01:00
2012-03-31 08:48:23 +02:00
2012-03-17 11:21:49 +01:00
2012-03-21 13:39:28 +01:00
2012-04-04 23:54:53 +02:00
2012-03-18 21:19:09 +01:00
2011-12-13 21:08:43 +01:00
2012-04-04 16:16:10 +02:00
2012-03-17 11:21:49 +01:00
2012-03-04 12:31:06 +01:00
2012-02-29 02:33:32 +01:00
2012-04-04 16:16:10 +02:00
2012-03-21 15:52:45 +01:00
2012-02-06 20:46:58 +01:00
2012-03-10 00:10:37 +01:00
2012-03-21 15:52:45 +01:00
2011-12-11 11:55:33 +01:00
2012-03-03 12:33:54 +01:00