Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  libxvid: Give more suitable names to libxvid-related files.
  libxvid: Separate libxvid encoder from libxvid rate control code.
  jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
  fate: cosmetics: lowercase some comments
  fate: Give more consistent names to some RealVideo/RealAudio tests.
  lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
  lavfi: add extended_data to AVFilterBuffer.
  lavc: check that extended_data is properly set in avcodec_encode_audio2().
  lavc: pad last audio frame with silence when needed.
  samplefmt: add a function for filling a buffer with silence.
  samplefmt: add a function for copying audio samples.
  lavr: do not try to copy to uninitialized output audio data.
  lavr: make avresample_read() with NULL output discard samples.
  fate: split idroq audio and video into separate tests
  fate: improve dependencies
  fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
  fate: split some combined tests into separate audio and video tests
  fate: fix dependencies for probe tests
  mips: intreadwrite: fix inline asm for gcc 4.8
  mips: intreadwrite: remove unnecessary inline asm
  ...

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	doc/filters.texi
	ffmpeg.c
	ffplay.c
	libavcodec/internal.h
	libavcodec/jpeglsdec.c
	libavcodec/libschroedingerdec.c
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.h
	tests/Makefile
	tests/fate/aac.mak
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/image.mak
	tests/fate/libavutil.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/qt.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/vqf.mak
	tests/ref/fate/ea-mad
	tests/ref/fate/ea-tqi

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 96 insertions, 0 deletions

diff --git a/tests/ref/fate/adpcm-ea-r1 b/tests/ref/fate/adpcm-ea-r1
new file mode 100644
index 0000000000..74d15c6f67
--- /dev/null
+++ b/tests/ref/fate/adpcm-ea-r1
@@ -0,0 +1,96 @@
+#tb 0: 1/48000
+0,          0,          0,     1624,     6496, 0x00000000
+0,       1624,       1624,     1596,     6384, 0x00000000
+0,       3220,       3220,     1596,     6384, 0x00000000
+0,       4816,       4816,     1596,     6384, 0x00000000
+0,       6412,       6412,     1596,     6384, 0x00000000
+0,       8008,       8008,     1624,     6496, 0xe2034d04
+0,       9632,       9632,     1596,     6384, 0x089c9157
+0,      11228,      11228,     1596,     6384, 0xeed5743c
+0,      12824,      12824,     1596,     6384, 0x71de6b34
+0,      14420,      14420,     1596,     6384, 0xc0d67710
+0,      16016,      16016,     1624,     6496, 0x35786490
+0,      17640,      17640,     1596,     6384, 0xdf1c99a2
+0,      19236,      19236,     1596,     6384, 0xca9591ad
+0,      20832,      20832,     1596,     6384, 0x6f0d9c3d
+0,      22428,      22428,     1596,     6384, 0xfacbbaee
+0,      24024,      24024,     1624,     6496, 0x927fb136
+0,      25648,      25648,     1596,     6384, 0x9d4f2572
+0,      27244,      27244,     1596,     6384, 0x2a3c6d08
+0,      28840,      28840,     1596,     6384, 0x4282b1e0
+0,      30436,      30436,     1596,     6384, 0xc4a77b9f
+0,      32032,      32032,     1624,     6496, 0x2af6a14f
+0,      33656,      33656,     1596,     6384, 0x4d734169
+0,      35252,      35252,     1596,     6384, 0xb91b5865
+0,      36848,      36848,     1596,     6384, 0x9dce2417
+0,      38444,      38444,     1596,     6384, 0xb7c4e1ce
+0,      40040,      40040,     1624,     6496, 0xef0dc07a
+0,      41664,      41664,     1596,     6384, 0x4ad21d10
+0,      43260,      43260,     1596,     6384, 0xcfe14682
+0,      44856,      44856,     1596,     6384, 0x07be48eb
+0,      46452,      46452,     1596,     6384, 0x09de3498
+0,      48048,      48048,     1624,     6496, 0xab2e9686
+0,      49672,      49672,     1596,     6384, 0x3aba3ccc
+0,      51268,      51268,     1596,     6384, 0x0a905ec3
+0,      52864,      52864,     1596,     6384, 0x76a93ce4
+0,      54460,      54460,     1596,     6384, 0xa99063a4
+0,      56056,      56056,     1624,     6496, 0xc16bb88d
+0,      57680,      57680,     1596,     6384, 0x650379bf
+0,      59276,      59276,     1596,     6384, 0x4e0749fe
+0,      60872,      60872,     1596,     6384, 0x778e8d12
+0,      62468,      62468,     1596,     6384, 0x9fa8c494
+0,      64064,      64064,     1624,     6496, 0x61d5bead
+0,      65688,      65688,     1596,     6384, 0x4da9bc3c
+0,      67284,      67284,     1596,     6384, 0xa72b6f93
+0,      68880,      68880,     1596,     6384, 0x811f5f77
+0,      70476,      70476,     1596,     6384, 0x83ea5e3d
+0,      72072,      72072,     1624,     6496, 0x78bab460
+0,      73696,      73696,     1596,     6384, 0xc9a07432
+0,      75292,      75292,     1596,     6384, 0x4b4f2a34
+0,      76888,      76888,     1596,     6384, 0x4d707a53
+0,      78484,      78484,     1596,     6384, 0x703efb60
+0,      80080,      80080,     1624,     6496, 0x319a77bb
+0,      81704,      81704,     1596,     6384, 0xbdfd82ec
+0,      83300,      83300,     1596,     6384, 0x413c3503
+0,      84896,      84896,     1596,     6384, 0xe6e666b3
+0,      86492,      86492,     1596,     6384, 0xa09c7342
+0,      88088,      88088,     1624,     6496, 0x60cba846
+0,      89712,      89712,     1596,     6384, 0x0ba34308
+0,      91308,      91308,     1596,     6384, 0xdc3a65f0
+0,      92904,      92904,     1596,     6384, 0x1ebf9dc4
+0,      94500,      94500,     1596,     6384, 0xbbcb1449
+0,      96096,      96096,     1624,     6496, 0x926574eb
+0,      97720,      97720,     1596,     6384, 0xb4da92f1
+0,      99316,      99316,     1596,     6384, 0xdbbd21e0
+0,     100912,     100912,     1596,     6384, 0x08510eff
+0,     102508,     102508,     1596,     6384, 0x9534b7ca
+0,     104104,     104104,     1624,     6496, 0x50a5ed30
+0,     105728,     105728,     1596,     6384, 0xf5ac2f7c
+0,     107324,     107324,     1596,     6384, 0x4fe1fa55
+0,     108920,     108920,     1596,     6384, 0xd61c4c05
+0,     110516,     110516,     1596,     6384, 0x56d11b45
+0,     112112,     112112,     1624,     6496, 0x3906084b
+0,     113736,     113736,     1596,     6384, 0x1ef31fed
+0,     115332,     115332,     1596,     6384, 0x58ed82f5
+0,     116928,     116928,     1596,     6384, 0xb31ccd1f
+0,     118524,     118524,     1596,     6384, 0xfb648285
+0,     120120,     120120,     1624,     6496, 0xfae2950b
+0,     121744,     121744,     1596,     6384, 0xe28c8357
+0,     123340,     123340,     1596,     6384, 0xda718e60
+0,     124936,     124936,     1596,     6384, 0x27516999
+0,     126532,     126532,     1596,     6384, 0x0ba07921
+0,     128128,     128128,     1624,     6496, 0xcfbecfab
+0,     129752,     129752,     1596,     6384, 0xae4cedcd
+0,     131348,     131348,     1596,     6384, 0x917b4707
+0,     132944,     132944,     1596,     6384, 0x8671b28e
+0,     134540,     134540,     1596,     6384, 0x9a1238fa
+0,     136136,     136136,     1624,     6496, 0x23b8f8ca
+0,     137760,     137760,     1596,     6384, 0x3903bcd6
+0,     139356,     139356,     1596,     6384, 0x0532b267
+0,     140952,     140952,     1596,     6384, 0xde931220
+0,     142548,     142548,     1596,     6384, 0x4ed70a80
+0,     144144,     144144,     1624,     6496, 0x4a52d5a1
+0,     145768,     145768,     1596,     6384, 0xc1be5760
+0,     147364,     147364,     1596,     6384, 0x790d69ba
+0,     148960,     148960,     1596,     6384, 0x9d73e6cf
+0,     150556,     150556,     1568,     6272, 0xbc0fc725