Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Apr 2012 20:26:50 +0000 (22:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Apr 2012 20:26:50 +0000 (22:26 +0200)
commit2c5a2958e961c25434a54c832a04139525f661da
tree7fba548115bae83f10089b8c9b5ff77ee9f14224
parent3e4b5e68c1589590736fce62c0e677c4632f965b
parent0becb07842b57ea225ddf0726de33b5f8e669297
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>
12 files changed:
configure
libavcodec/aacenc.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/vp8dsp.asm
libavfilter/vf_unsharp.c
libswscale/input.c
libswscale/output.c
tests/Makefile