Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg12: check for available bits to avoid an infinite loop
  fate: add some shorthands to run groups of tests
  fate: Give some tests more sensible names.
  cosmetics: Rename ffsink to avsink.

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/dpcm.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/pcm.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/wma.mak

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

1 files changed, 143 insertions, 0 deletions

diff --git a/tests/ref/fate/adpcm-thp b/tests/ref/fate/adpcm-thp
new file mode 100644
index 0000000000..b1046d8df5
--- /dev/null
+++ b/tests/ref/fate/adpcm-thp
@@ -0,0 +1,143 @@
+0, 0, 291840, 0xbd7e0b22
+1, 0, 4312, 0x469714f6
+0, 3003, 291840, 0xf6e12ca5
+1, 3032, 4256, 0xe03dd882
+0, 6006, 291840, 0x528c7049
+1, 6024, 4312, 0x46b901f7
+0, 9009, 291840, 0x93055de9
+1, 9056, 4256, 0x8d4a54e4
+0, 12012, 291840, 0xf95a51c1
+1, 12049, 4256, 0xfd616b67
+0, 15015, 291840, 0x6ad3a65a
+1, 15041, 4312, 0xefe62302
+0, 18018, 291840, 0x494684a7
+1, 18073, 4256, 0xab11684e
+0, 21021, 291840, 0x74c14eb1
+1, 21066, 4256, 0xb4b3feb8
+0, 24024, 291840, 0x149fcb7e
+1, 24058, 4312, 0x71db6461
+0, 27027, 291840, 0x25649761
+1, 27090, 4256, 0x090e5efa
+0, 30030, 291840, 0xbc3f9052
+1, 30083, 4256, 0x36f49c28
+0, 33033, 291840, 0x080edfff
+1, 33075, 4312, 0x0fe3d262
+0, 36036, 291840, 0x6d7ad684
+1, 36107, 4256, 0x199ce269
+0, 39039, 291840, 0x6d53844d
+1, 39099, 4256, 0x98342d05
+0, 42042, 291840, 0xf7ad5385
+1, 42092, 4312, 0xb6fb7ebe
+0, 45045, 291840, 0x0241b56a
+1, 45124, 4256, 0x033dd562
+0, 48048, 291840, 0x120122c8
+1, 48116, 4256, 0xc2cc17e0
+0, 51051, 291840, 0x31b0f32a
+1, 51109, 4312, 0x4bb3ff50
+0, 54054, 291840, 0x14068b98
+1, 54141, 4256, 0x6f2671ef
+0, 57057, 291840, 0xeeec658b
+1, 57133, 4256, 0x5a337bf4
+0, 60060, 291840, 0x9376374c
+1, 60126, 4312, 0xa71f6967
+0, 63063, 291840, 0x091e8c6e
+1, 63158, 4256, 0x48084aa9
+0, 66066, 291840, 0x744ad07f
+1, 66150, 4256, 0x3cce4218
+0, 69069, 291840, 0xf99c554e
+1, 69143, 4312, 0xcbb8f73d
+0, 72072, 291840, 0xc84bd677
+1, 72174, 4256, 0x36825021
+0, 75075, 291840, 0x3898d474
+1, 75167, 4256, 0xeae036c6
+0, 78078, 291840, 0x1e2910c8
+1, 78159, 4312, 0x0d650ac6
+0, 81081, 291840, 0xb11f58bc
+1, 81191, 4256, 0xfba4f58c
+0, 84084, 291840, 0xf89170ee
+1, 84184, 4256, 0x54311f9b
+0, 87087, 291840, 0x8f239dc3
+1, 87176, 4312, 0x286386b3
+0, 90090, 291840, 0x8538c76c
+1, 90208, 4256, 0x871896de
+0, 93093, 291840, 0x162ee66f
+1, 93201, 4256, 0x9ef9f970
+0, 96096, 291840, 0x5f8708a5
+1, 96193, 4312, 0xf9ae97f1
+0, 99099, 291840, 0x95802dfb
+1, 99225, 4256, 0x0ad0d765
+0, 102102, 291840, 0xc424630d
+1, 102218, 4256, 0x8e6aa9b5
+0, 105105, 291840, 0xfb8a8667
+1, 105210, 4312, 0x8362787b
+0, 108108, 291840, 0xbad79af5
+1, 108242, 4256, 0x9b6a5d9c
+0, 111111, 291840, 0xc733b325
+1, 111234, 4256, 0xfb715d8f
+0, 114114, 291840, 0x4bfbcd70
+1, 114227, 4312, 0x02bd8075
+0, 117117, 291840, 0x502cd950
+1, 117259, 4256, 0x428eb932
+0, 120120, 291840, 0x8461ca2c
+1, 120251, 4256, 0x17ea8c94
+0, 123123, 291840, 0x00219b0d
+1, 123244, 4312, 0xb3e761d7
+0, 126126, 291840, 0xa4de45e1
+1, 126276, 4256, 0x0919755a
+0, 129129, 291840, 0xacd3f4df
+1, 129268, 4256, 0x5e520edd
+0, 132132, 291840, 0x2203a369
+1, 132261, 4312, 0x69aa070e
+0, 135135, 291840, 0x0a66effa
+1, 135293, 4256, 0xf8192f7d
+0, 138138, 291840, 0x7ac1fd91
+1, 138285, 4256, 0xaad4475c
+0, 141141, 291840, 0x84970aa7
+1, 141278, 4312, 0x0cabcfcb
+0, 144144, 291840, 0x569d145f
+1, 144309, 4256, 0x952f0f96
+0, 147147, 291840, 0xe51efe1b
+1, 147302, 4256, 0x1b805a0c
+0, 150150, 291840, 0x38e2cd78
+1, 150294, 4312, 0x93043d2a
+0, 153153, 291840, 0x93428ea2
+1, 153326, 4256, 0x38b99e44
+0, 156156, 291840, 0x3d3f5b17
+1, 156319, 4256, 0x60cc52ff
+0, 159159, 291840, 0x9546127d
+1, 159311, 4312, 0x6a875849
+0, 162162, 291840, 0x4178be54
+1, 162343, 4256, 0xd08d6d0e
+0, 165165, 291840, 0x0d0f8036
+1, 165336, 4256, 0x36bfe48e
+0, 168168, 291840, 0xc20557b9
+1, 168328, 4312, 0x795c6134
+0, 171171, 291840, 0x6d4b2d64
+1, 171360, 4256, 0x4fd79583
+0, 174174, 291840, 0xa750125d
+1, 174353, 4256, 0x65e2ab9f
+0, 177177, 291840, 0x04623ce3
+1, 177345, 4312, 0xedeede4a
+0, 180180, 291840, 0xc7f2bbc7
+1, 180377, 4256, 0x097e0d09
+0, 183183, 291840, 0x6e271336
+1, 183369, 4256, 0x58afa133
+0, 186186, 291840, 0xcfbd4246
+1, 186362, 4312, 0x442525b5
+0, 189189, 291840, 0xe1493be9
+1, 189394, 4256, 0x6645c591
+0, 192192, 291840, 0x6c731194
+1, 192386, 4256, 0xb0dd948a
+0, 195195, 291840, 0x0fc30cc2
+1, 195379, 4312, 0x12684e69
+0, 198198, 291840, 0x967427f3
+1, 198411, 4256, 0xb45098e3
+0, 201201, 291840, 0x55ae3b00
+1, 201403, 4256, 0xb6d3c61c
+0, 204204, 291840, 0xbe4f200c
+1, 204396, 4312, 0xb46b5b22
+0, 207207, 291840, 0xc515e443
+1, 207428, 4256, 0x9a556830
+0, 210210, 291840, 0xd738bd69
+1, 210420, 4256, 0x67ca2b35
+0, 213213, 291840, 0xa8e0ab69