ffmpeg/libswscale
Michael Niedermayer 55c49afc42 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  yuv4mpeg: return proper error codes.
  Give all anonymously typedeffed structs in headers a name
  fate: Add parseutils test
  parseutils-test: Drop random colors from parsing test
  vf_pad/scale: use double precision for aspect ratios.
  build: error on variable-length arrays
  ppc: swscale: rework yuv2planeX_altivec()
  ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
  x86: dsputil: kill VLA in gmc_mmx()
  libspeexenc: Updated commentary to reflect recent changes
  libspeexenc: Add an option for enabling DTX
  doc/APIchanges: fill in missing dates and hashes.
  lavr: bump major to 1 and declare it stable.
  lavr: change the type of the data buffers to uint8_t**.
  lavc: deprecate the audio resampling API.

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	ffplay.c
	libavcodec/dwt.h
	libavcodec/libspeexenc.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavformat/asf.h
	tests/fate/libavutil.mak
	tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06 13:45:08 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
x86 swscale: fix To{Y,UV} extern prototypes. 2012-09-30 20:45:32 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
input.c swscale/input: silence warnings about incompatible pointer types 2012-07-19 15:49:21 +00:00
libswscale.v
options.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
output.c sws/output: use unsigned variables where harmless overflows are expected. 2012-09-10 21:04:01 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rgb2rgb.h swscale: unscaled rgba64->rgb48 2012-07-19 00:17:16 +00:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
swscale-test.c
swscale.c swscale: move main swscale wraper to swscale.c 2012-09-30 23:10:56 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
swscale_internal.h swscale: fix usePal() 2012-08-30 13:37:03 +02:00
swscale_unscaled.c sws: drop unused variable 2012-09-30 23:14:20 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
yuv2rgb.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00