ffmpeg/libavcodec
Michael Niedermayer ad1c8dd673 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: add dxtory test
  adx_parser: rewrite.
  adxdec: Validate channel count to fix a division by zero.
  adxdec: Do not require extradata.
  cmdutils: K&R reformatting cosmetics
  alacdec: implement the 2-pass prediction type.
  alacenc: implement the 2-pass prediction type.
  alacenc: do not generate invalid multi-channel ALAC files
  alacdec: fill in missing or guessed info about the extradata format.
  utvideo: proper median prediction for interlaced videos
  lavu: bump lavu minor for av_popcount64
  dca: K&R formatting cosmetics
  dct: K&R formatting cosmetics
  lavf: flush decoders in avformat_find_stream_info().
  win32: detect number of CPUs using affinity
  Add av_popcount64
  snow: Restore three mistakenly removed casts.

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/adx_parser.c
	libavcodec/adxdec.c
	libavcodec/alacenc.c
	libavutil/avutil.h
	tests/fate/screen.mak

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