1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
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
..
2012-10-05 00:18:01 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-06-03 01:53:36 +02:00
2012-08-09 00:02:05 +00:00
2012-08-15 22:32:06 +03:00
2012-10-01 22:24:17 +02:00
2012-09-21 01:03:31 +02:00
2012-09-29 16:25:29 +02:00
2012-08-14 18:58:49 +02:00
2012-08-07 23:57:21 +02:00
2012-09-30 00:13:54 +02:00
2012-05-18 23:34:11 +02:00
2012-09-25 18:10:11 +02:00
2012-08-27 18:31:21 +02:00
2012-08-25 03:55:50 +02:00
2012-08-15 22:32:06 +03:00
2012-09-04 18:37:54 +03:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-19 18:44:46 +02:00
2012-09-30 14:05:04 +00:00
2012-06-07 21:07:17 +02:00
2012-08-13 04:58:15 +02:00
2012-07-10 02:17:52 +02:00
2012-10-01 10:24:28 +02:00
2012-05-18 23:34:11 +02:00
2012-04-22 22:26:55 +02:00
2012-07-22 05:18:01 +02:00
2012-05-18 23:34:11 +02:00
2012-09-26 01:56:01 +02:00
2012-09-03 23:26:14 +02:00
2012-09-03 23:23:40 +02:00
2012-07-05 02:54:34 +00:00
2012-10-03 16:14:59 +02:00
2012-09-15 22:13:21 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-09-23 21:12:23 +02:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +02:00
2012-08-15 22:32:06 +03:00
2012-06-21 01:30:16 +00:00
2012-08-12 05:32:07 +02:00
2012-09-03 01:26:57 +02:00
2012-09-18 17:37:41 +02:00
2012-09-19 11:05:36 -07:00
2012-10-03 18:20:28 +02:00
2012-10-01 22:24:17 +02:00
2012-08-18 09:52:15 +02:00
2012-09-30 13:39:38 +00:00
2012-08-28 04:07:53 +02:00
2012-09-23 15:24:08 +02:00
2012-06-29 20:43:30 +02:00