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-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
2011-06-30 09:47:32 +01:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
crc
2011-07-03 17:17:54 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-04-01 11:01:08 +02:00
2012-03-02 18:58:19 +02:00
2011-07-04 16:26:26 +01:00
2012-02-26 07:48:45 +01:00
2012-03-27 17:54:04 -07:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2011-07-03 18:19:18 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
mtv
2012-05-14 12:49:42 +01:00
2012-05-14 12:50:01 +01:00
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
sha
2010-08-31 20:07:38 +00:00
2012-02-08 21:51:24 +01:00
smc
2012-02-26 07:48:45 +01:00
2010-12-28 23:52:53 +00:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
w64
2012-02-26 07:48:45 +01:00
2010-08-28 14:51:51 +00:00
2012-01-08 18:33:59 -08:00
2012-03-22 19:52:56 +01:00