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, 134 insertions, 0 deletions

diff --git a/tests/ref/fate/adpcm-ea-2 b/tests/ref/fate/adpcm-ea-2
new file mode 100644
index 0000000000..f58d9a00ce
--- /dev/null
+++ b/tests/ref/fate/adpcm-ea-2
@@ -0,0 +1,134 @@
+#tb 0: 1/22050
+0,          0,          0,     1484,     5936, 0xea261a29
+0,       1484,       1484,     1456,     5824, 0x253df061
+0,       2940,       2940,     1484,     5936, 0x603a5bd7
+0,       4424,       4424,     1456,     5824, 0x9d283f59
+0,       5880,       5880,     1484,     5936, 0x49323497
+0,       7364,       7364,     1456,     5824, 0x7c299939
+0,       8820,       8820,     1484,     5936, 0x9f918e9a
+0,      10304,      10304,     1456,     5824, 0x1226b534
+0,      11760,      11760,     1484,     5936, 0xdd159326
+0,      13244,      13244,     1456,     5824, 0x361ad10f
+0,      14700,      14700,     1484,     5936, 0x6ccac9e3
+0,      16184,      16184,     1456,     5824, 0x1861efef
+0,      17640,      17640,     1484,     5936, 0x5f718eb9
+0,      19124,      19124,     1456,     5824, 0xd4ca72ba
+0,      20580,      20580,     1484,     5936, 0xbf2b27e6
+0,      22064,      22064,     1456,     5824, 0xcb6f024e
+0,      23520,      23520,     1484,     5936, 0x7dfb7e05
+0,      25004,      25004,     1456,     5824, 0x80e16f13
+0,      26460,      26460,     1484,     5936, 0x0fb59227
+0,      27944,      27944,     1456,     5824, 0x4d6f1fdb
+0,      29400,      29400,     1484,     5936, 0x505a5103
+0,      30884,      30884,     1456,     5824, 0x47ef4c13
+0,      32340,      32340,     1484,     5936, 0xbe4795fb
+0,      33824,      33824,     1456,     5824, 0xb82cc4ff
+0,      35280,      35280,     1484,     5936, 0xf7c6ab8d
+0,      36764,      36764,     1456,     5824, 0x1442f5e0
+0,      38220,      38220,     1484,     5936, 0x64659389
+0,      39704,      39704,     1456,     5824, 0xdd81725c
+0,      41160,      41160,     1484,     5936, 0x7f7c604f
+0,      42644,      42644,     1456,     5824, 0xafc77beb
+0,      44100,      44100,     1484,     5936, 0x24f88e4d
+0,      45584,      45584,     1456,     5824, 0xa31956ca
+0,      47040,      47040,     1484,     5936, 0x958e02b9
+0,      48524,      48524,     1456,     5824, 0xcfc79890
+0,      49980,      49980,     1484,     5936, 0xc7e788ae
+0,      51464,      51464,     1456,     5824, 0x4b6b1acc
+0,      52920,      52920,     1484,     5936, 0xa74496dc
+0,      54404,      54404,     1456,     5824, 0x719e6171
+0,      55860,      55860,     1484,     5936, 0x9346222d
+0,      57344,      57344,     1456,     5824, 0x9e2a876e
+0,      58800,      58800,     1484,     5936, 0xeca6ea64
+0,      60284,      60284,     1456,     5824, 0x07d8174f
+0,      61740,      61740,     1484,     5936, 0x2df5aa6b
+0,      63224,      63224,     1456,     5824, 0x314e7034
+0,      64680,      64680,     1484,     5936, 0x5a328768
+0,      66164,      66164,     1456,     5824, 0x32b92446
+0,      67620,      67620,     1484,     5936, 0x20ecbc9b
+0,      69104,      69104,     1456,     5824, 0x76019c14
+0,      70560,      70560,     1484,     5936, 0x8c3ef8a6
+0,      72044,      72044,     1456,     5824, 0xcdaab50b
+0,      73500,      73500,     1484,     5936, 0xb2f87f4f
+0,      74984,      74984,     1456,     5824, 0x70c26379
+0,      76440,      76440,     1484,     5936, 0x5691ecfd
+0,      77924,      77924,     1456,     5824, 0x61e208fe
+0,      79380,      79380,     1484,     5936, 0x87d1a5e0
+0,      80864,      80864,     1456,     5824, 0x02054cfd
+0,      82320,      82320,     1484,     5936, 0x22ff1c4b
+0,      83804,      83804,     1456,     5824, 0xc6d87fef
+0,      85260,      85260,     1484,     5936, 0x9028bb3b
+0,      86744,      86744,     1456,     5824, 0xbadde406
+0,      88200,      88200,     1484,     5936, 0x6e88ddf1
+0,      89684,      89684,     1456,     5824, 0x5bb8be6e
+0,      91140,      91140,     1484,     5936, 0xe1f8d7fc
+0,      92624,      92624,     1456,     5824, 0xc824e388
+0,      94080,      94080,     1484,     5936, 0x654371a9
+0,      95564,      95564,     1456,     5824, 0xae6ee9ec
+0,      97020,      97020,     1484,     5936, 0x9aa4550d
+0,      98504,      98504,     1456,     5824, 0xdce210ac
+0,      99960,      99960,     1484,     5936, 0xb12641c8
+0,     101444,     101444,     1456,     5824, 0x277e014b
+0,     102900,     102900,     1484,     5936, 0xb0d262de
+0,     104384,     104384,     1456,     5824, 0xf94d6f49
+0,     105840,     105840,     1484,     5936, 0x3d7848cb
+0,     107324,     107324,     1456,     5824, 0xe67fc08e
+0,     108780,     108780,     1484,     5936, 0x0475e0d6
+0,     110264,     110264,     1456,     5824, 0x8a9a4a2e
+0,     111720,     111720,     1484,     5936, 0x82576204
+0,     113204,     113204,     1456,     5824, 0x3017b648
+0,     114660,     114660,     1484,     5936, 0xca4c3e04
+0,     116144,     116144,     1456,     5824, 0x340077d1
+0,     117600,     117600,     1484,     5936, 0x805bea6e
+0,     119084,     119084,     1456,     5824, 0x2cf6c87b
+0,     120540,     120540,     1484,     5936, 0x3635bc5f
+0,     122024,     122024,     1456,     5824, 0x0d7a81c7
+0,     123480,     123480,     1484,     5936, 0x26179764
+0,     124964,     124964,     1456,     5824, 0xa0b2454f
+0,     126420,     126420,     1484,     5936, 0x91d24608
+0,     127904,     127904,     1456,     5824, 0x6509b3e1
+0,     129360,     129360,     1484,     5936, 0xa0e3c9fc
+0,     130844,     130844,     1456,     5824, 0x18682a2f
+0,     132300,     132300,     1484,     5936, 0x89cea4ff
+0,     133784,     133784,     1456,     5824, 0x7dd22b85
+0,     135240,     135240,     1484,     5936, 0x8b2eeb8d
+0,     136724,     136724,     1456,     5824, 0x0c21af82
+0,     138180,     138180,     1484,     5936, 0x9c5a748d
+0,     139664,     139664,     1456,     5824, 0x1dc72c5c
+0,     141120,     141120,     1484,     5936, 0xe6129383
+0,     142604,     142604,     1456,     5824, 0x0a44312a
+0,     144060,     144060,     1484,     5936, 0x7ed30640
+0,     145544,     145544,     1456,     5824, 0xede15f25
+0,     147000,     147000,     1484,     5936, 0x0096d0f3
+0,     148484,     148484,     1456,     5824, 0x13764b4b
+0,     149940,     149940,     1484,     5936, 0xd4608756
+0,     151424,     151424,     1456,     5824, 0x254b5f2a
+0,     152880,     152880,     1484,     5936, 0x7705b830
+0,     154364,     154364,     1456,     5824, 0x64a63d78
+0,     155820,     155820,     1484,     5936, 0xc02d81a6
+0,     157304,     157304,     1456,     5824, 0xd239e55e
+0,     158760,     158760,     1484,     5936, 0x8018cd3a
+0,     160244,     160244,     1456,     5824, 0xf86b8a98
+0,     161700,     161700,     1484,     5936, 0x2a0078bc
+0,     163184,     163184,     1456,     5824, 0x058d4e1b
+0,     164640,     164640,     1484,     5936, 0xbc718309
+0,     166124,     166124,     1456,     5824, 0xaf6c29e5
+0,     167580,     167580,     1484,     5936, 0x80df004d
+0,     169064,     169064,     1456,     5824, 0xeca5aa57
+0,     170520,     170520,     1484,     5936, 0xb793a8f8
+0,     172004,     172004,     1456,     5824, 0x70fa6aff
+0,     173460,     173460,     1484,     5936, 0xda8d4cc6
+0,     174944,     174944,     1456,     5824, 0xa70088eb
+0,     176400,     176400,     1484,     5936, 0x1c0b0aab
+0,     177884,     177884,     1456,     5824, 0x234d2436
+0,     179340,     179340,     1484,     5936, 0xf79d731e
+0,     180824,     180824,     1456,     5824, 0x5a4e454a
+0,     182280,     182280,     1484,     5936, 0xccf6d042
+0,     183764,     183764,     1456,     5824, 0x4e524d14
+0,     185220,     185220,     1484,     5936, 0xf8f2fcc3
+0,     186704,     186704,     1456,     5824, 0x08f12491
+0,     188160,     188160,     1484,     5936, 0x506e0a42
+0,     189644,     189644,     1456,     5824, 0x7cf05049
+0,     191100,     191100,     1484,     5936, 0xdeb9d295
+0,     192584,     192584,     1456,     5824, 0x758ef642
+0,     194040,     194040,     1484,     5936, 0x91903980