ffmpeg/libavcodec
Michael Niedermayer 7e944159c6 Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
  vcr1: Add vcr1_ prefixes to all static functions with generic names.
  vcr1: Fix return type of common_init to match the function pointer signature.
  vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
  motion-test: remove disabled code
  gxfenc: remove disabled half-implemented MJPEG tag
  x86: use more standard construct for setting ASM functions in FFT code
  fate: westwood-aud: disable decoding
  fate: caf: disable decoding
  fate: film-cvid: drop pcm audio and rename test
  fate: d-cinema-demux: drop unnecessary flags
  fate: split off dpcm-interplay from interplay-mve tests
  fate: rename funcom-iss to adpcm-ima-iss
  fate: rename cryo-apc to adpcm-ima-apc
  fate: rename adpcm-psx-str-v3 to adpcm-xa
  fate: split off adpcm-ms-mono test from dxa-feeble
  fate: split off adpcm-ima-ws test from vqa-cc
  fate: add adpcm-ima-smjpeg test
  fate: split off adpcm-ima-amv from amv test
  fate: separate bmv audio and video tests
  fate: separate delphine-cin audio and video tests
  ...

Conflicts:
	doc/platform.texi
	libavcodec/vcr1.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/ref/fate/ea-mad-pcm-planar
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mtv
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/qtrle-2bit
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/vqa-cc

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