Merge remote-tracking branch 'qatar/master'

* qatar/master: (29 commits)
  cabac: Move code only used within the CABAC test program into the test program.
  vp56: Drop unnecessary cabac.h #include.
  h264-test: Initialize AVCodecContext.av_class.
  build: Skip compiling network.h and rtsp.h if networking is not enabled.
  cosmetics: drop some pointless parentheses
  Disable annoying warning without changing behavior
  faq: Solutions for common problems with sample paths when running FATE.
  avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
  avcodec: fix avcodec_encode_audio() documentation.
  FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
  vqf: recognize more metadata chunks
  FATE test: BMV demuxer and associated video and audio decoders.
  FATE: indeo4 video decoder test.
  FATE: update xxan-wc4 test to a sample with more code coverage.
  Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
  g722enc: validate AVCodecContext.trellis
  g722enc: set frame_size, and also handle an odd number of input samples
  g722enc: split encoding into separate functions for trellis vs. no trellis
  mpegaudiodec: Use clearer pointer math
  tta: Fix returned error code at EOF
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/indeo3.c
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/libxvidff.c
	libavcodec/mpegvideo.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavfilter/vsrc_buffer.c
	libavformat/Makefile
	tests/fate/indeo.mak
	tests/ref/acodec/g722

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

1 files changed, 100 insertions, 0 deletions

diff --git a/tests/ref/fate/indeo4 b/tests/ref/fate/indeo4
new file mode 100644
index 0000000000..0f088ec7d9
--- /dev/null
+++ b/tests/ref/fate/indeo4
@@ -0,0 +1,100 @@
+0, 0, 86400, 0x98f5e422
+0, 6000, 86400, 0x1864cb06
+0, 12000, 86400, 0xb09532ef
+0, 18000, 86400, 0x3cd3dcdc
+0, 24000, 86400, 0xe738847f
+0, 30000, 86400, 0xc9b13afb
+0, 36000, 86400, 0x5005d035
+0, 42000, 86400, 0x22f63e17
+0, 48000, 86400, 0x93391f02
+0, 54000, 86400, 0x264830fd
+0, 60000, 86400, 0x8fff9f5f
+0, 66000, 86400, 0x524997fe
+0, 72000, 86400, 0x54e330f9
+0, 78000, 86400, 0x1d766a22
+0, 84000, 86400, 0x683a70ac
+0, 90000, 86400, 0x553b7b3d
+0, 96000, 86400, 0x822c79bc
+0, 102000, 86400, 0xe1087a1c
+0, 108000, 86400, 0xff397595
+0, 114000, 86400, 0x1b6b7717
+0, 120000, 86400, 0x6c5275c1
+0, 126000, 86400, 0x4e6a7189
+0, 132000, 86400, 0x285c6eba
+0, 138000, 86400, 0xce647227
+0, 144000, 86400, 0xa0d07b1c
+0, 150000, 86400, 0x5b567861
+0, 156000, 86400, 0x105873ec
+0, 162000, 86400, 0x59267fa0
+0, 168000, 86400, 0xaeac839f
+0, 174000, 86400, 0x2faf7402
+0, 180000, 86400, 0xc8547a30
+0, 186000, 86400, 0x3d357d49
+0, 192000, 86400, 0x75db6d6c
+0, 198000, 86400, 0x9fbf68e9
+0, 204000, 86400, 0x56a64d26
+0, 210000, 86400, 0xce9e1f43
+0, 216000, 86400, 0xa4d7fddc
+0, 222000, 86400, 0x3e20d77c
+0, 228000, 86400, 0x4680661d
+0, 234000, 86400, 0xf1b20af3
+0, 240000, 86400, 0xb79d8045
+0, 246000, 86400, 0x9479fc8a
+0, 252000, 86400, 0x232965c3
+0, 258000, 86400, 0xd18bca17
+0, 264000, 86400, 0xb9064249
+0, 270000, 86400, 0xcc48ab34
+0, 276000, 86400, 0xe25018cd
+0, 282000, 86400, 0x8da489ee
+0, 288000, 86400, 0x90de0fc1
+0, 294000, 86400, 0x2428dcee
+0, 300000, 86400, 0x4316e1ae
+0, 306000, 86400, 0x2b25e54c
+0, 312000, 86400, 0x736ce020
+0, 318000, 86400, 0x9a6be09a
+0, 324000, 86400, 0x23bddbcd
+0, 330000, 86400, 0x9368e465
+0, 336000, 86400, 0x1ae9bb87
+0, 342000, 86400, 0x4e591f32
+0, 348000, 86400, 0xba1bf9dc
+0, 354000, 86400, 0x07f0aa60
+0, 360000, 86400, 0xf5a2cfa2
+0, 366000, 86400, 0xcba5fc18
+0, 372000, 86400, 0x858c0cfe
+0, 378000, 86400, 0xac73ecd4
+0, 384000, 86400, 0xf41bf03c
+0, 390000, 86400, 0x928ed146
+0, 396000, 86400, 0x9ff5990a
+0, 402000, 86400, 0xc2fabc3d
+0, 408000, 86400, 0x94af87a3
+0, 414000, 86400, 0x9bae514c
+0, 420000, 86400, 0xe0da267a
+0, 426000, 86400, 0x1d40f55c
+0, 432000, 86400, 0xe6173b68
+0, 438000, 86400, 0x1445490d
+0, 444000, 86400, 0x8d8753c1
+0, 450000, 86400, 0xe5a7779d
+0, 456000, 86400, 0x3cfc66ef
+0, 462000, 86400, 0xa5d45608
+0, 468000, 86400, 0x62f17be1
+0, 474000, 86400, 0xa64c84d3
+0, 480000, 86400, 0xf98162f0
+0, 486000, 86400, 0x0db77d9f
+0, 492000, 86400, 0x0f0cbac9
+0, 498000, 86400, 0xb9934e97
+0, 504000, 86400, 0x7f8fa248
+0, 510000, 86400, 0xdfd96768
+0, 516000, 86400, 0x81b07919
+0, 522000, 86400, 0x66c11e9f
+0, 528000, 86400, 0xd86eb114
+0, 534000, 86400, 0x67f20c1f
+0, 540000, 86400, 0x66915de5
+0, 546000, 86400, 0x2b8aa76f
+0, 552000, 86400, 0x85b5a3d2
+0, 558000, 86400, 0x80d29ed6
+0, 564000, 86400, 0x4d508e2c
+0, 570000, 86400, 0x0d407374
+0, 576000, 86400, 0xd4068016
+0, 582000, 86400, 0x6ffab98f
+0, 588000, 86400, 0x2360903d
+0, 594000, 86400, 0x470e04a0