FFmpeg/libswscale
Michael Niedermayer 552ec4c9fd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  get_bits: remove A32 variant
  avconv: support stream specifiers in -metadata and -map_metadata
  wavpack: Fix 32-bit clipping
  wavpack: Clip samples after shifting
  h264: don't drop B-frames after next keyframe on POC reset.
  get_bits: remove useless pointer casts
  configure: refactor lists of tests and components into variables
  rv40: NEON optimised weak loop filter
  mpegts: replace some magic numbers with the existing define
  swscale: add unscaled packed 16 bit per component endianess conversion

Conflicts:
	libavcodec/get_bits.h
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-17 02:18:16 +01:00
..
bfin Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +02:00
mlib Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rgb2rgb_template.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
rgb2rgb.h lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2011-12-17 02:18:16 +01:00
swscale-test.c sws: update copyright dates 2011-11-18 21:44:26 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
yuv2rgb.c sws: Fix warning: ‘abase’ may be used uninitialized in this function 2011-11-18 21:51:29 +01:00