1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
ppc Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
sparc Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
colorspace-test.c
input.c Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
libswscale.v
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
output.c Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.h
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-04-04 01:14:45 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-04-04 01:14:45 +02:00
swscale-test.c
swscale.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
swscale.h
utils.c swscale: Merge a hunk from qatar that seems to have been forgotten or lost. 2012-03-21 15:30:52 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00