1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 0bb57f8bf0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Remove ffmpeg.
  aacenc: Simplify windowing
  aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.
  aacenc: Deinterleave input samples before processing.
  aacenc: Store channel count in AACEncContext.
  aacenc: Move Q^3/4 calculation to it's own table
  aacenc: Request normalized float samples instead of converting s16 samples to float.
  aacpsy: Replace an if with FFMAX in LAME windowing.
  aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.
  aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
  aacenc: cosmetics: move init() and end() to the bottom of the file.
  aacenc: aac_encode_init() cleanup
  XWD encoder and decoder
  vc1: don't read the interpfrm and bfraction elements for interlaced frames
  mxfdec: fix memleak on mxf_read_close()
  westwood: split the AUD and VQA demuxers into separate files.

Conflicts:
	.gitignore
	Changelog
	Makefile
	configure
	doc/ffmpeg.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/aacenc.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/img2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-24 02:41:53 +01:00
..
2012-01-17 08:41:39 +01:00
2012-01-03 16:28:17 -05:00
2012-01-14 01:17:06 +01:00
2012-01-17 20:16:35 +01:00
2012-01-14 17:23:57 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2012-01-14 04:47:27 +01:00
2011-12-28 22:05:24 +01:00
2011-12-30 20:00:53 +01:00
2012-01-19 17:12:43 +01:00
2012-01-14 01:15:42 +01:00
2011-12-11 00:32:25 +01:00
2011-12-10 11:58:03 +01:00
2011-12-19 16:30:30 +01:00
2012-01-17 20:16:35 +01:00
2012-01-22 14:41:15 +01:00
2011-12-30 20:00:53 +01:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2011-12-23 05:58:32 +01:00
2012-01-15 14:13:25 +01:00
2012-01-12 16:32:55 +01:00
2012-01-07 00:11:43 +01:00
2012-01-17 20:16:35 +01:00
2012-01-12 16:32:55 +01:00
2011-12-17 05:04:56 +01:00
2011-12-13 15:46:23 +01:00
2012-01-23 19:47:49 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2011-12-30 20:00:53 +01:00
2012-01-12 17:02:13 +01:00
2011-12-13 21:08:43 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2011-12-30 20:00:53 +01:00
2011-12-23 11:39:41 +01:00
2012-01-22 04:49:46 +01:00
2012-01-14 01:10:13 +01:00
2012-01-11 18:14:13 +01:00
2012-01-14 22:58:19 +01:00
2011-12-13 19:54:31 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-16 19:21:24 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00