ffmpeg/libavresample
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
..
arm Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
x86 x86: Replace checks for CPU extensions and flags by convenience macros 2012-09-08 18:18:34 +02:00
audio_convert.c ARM: libavresample: NEON optimised flat float to s16 conversion 2012-09-13 19:15:42 +01:00
audio_convert.h ARM: libavresample: NEON optimised flat float to s16 conversion 2012-09-13 19:15:42 +01:00
audio_data.c lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
audio_data.h lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
audio_mix_matrix.c lavr/audio_mix_matrix: acknowledge the existence of LFE2. 2012-09-12 18:26:53 -04:00
audio_mix.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
audio_mix.h
avresample-test.c lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
avresample.h lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
internal.h libavresample: add mix level normalization option 2012-08-14 23:36:56 +02:00
libavresample.v
Makefile
options.c avopt: Explicitly store float/double option defaults in .dbl 2012-09-04 23:13:51 +03:00
resample_template.c
resample.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
resample.h
utils.c Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
version.h lavr: bump major to 1 and declare it stable. 2012-10-05 13:50:13 +02:00