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>

32 files changed, 0 insertions, 0 deletions

diff --git a/tests/ref/fate/creative-adpcm b/tests/ref/fate/adpcm-creative
index 039ca3ab67..039ca3ab67 100644
--- a/tests/ref/fate/creative-adpcm
+++ b/tests/ref/fate/adpcm-creative
diff --git a/tests/ref/fate/creative-adpcm-8-2.6bit b/tests/ref/fate/adpcm-creative-8-2.6bit
index 835760448b..835760448b 100644
--- a/tests/ref/fate/creative-adpcm-8-2.6bit
+++ b/tests/ref/fate/adpcm-creative-8-2.6bit
diff --git a/tests/ref/fate/creative-adpcm-8-2bit b/tests/ref/fate/adpcm-creative-8-2bit
index 4166846dcb..4166846dcb 100644
--- a/tests/ref/fate/creative-adpcm-8-2bit
+++ b/tests/ref/fate/adpcm-creative-8-2bit
diff --git a/tests/ref/fate/creative-adpcm-8-4bit b/tests/ref/fate/adpcm-creative-8-4bit
index 2d579aa91b..2d579aa91b 100644
--- a/tests/ref/fate/creative-adpcm-8-4bit
+++ b/tests/ref/fate/adpcm-creative-8-4bit
diff --git a/tests/ref/fate/ea-mad-adpcm-ea-r1 b/tests/ref/fate/adpcm-ea-mad-ea-r1
index b75de55f39..b75de55f39 100644
--- a/tests/ref/fate/ea-mad-adpcm-ea-r1
+++ b/tests/ref/fate/adpcm-ea-mad-ea-r1
diff --git a/tests/ref/fate/ea-tqi-adpcm b/tests/ref/fate/adpcm-ea-tqi
index 4fbc117070..4fbc117070 100644
--- a/tests/ref/fate/ea-tqi-adpcm
+++ b/tests/ref/fate/adpcm-ea-tqi
diff --git a/tests/ref/fate/duck-dk3 b/tests/ref/fate/adpcm-ima-dk3
index 9aad92beed..9aad92beed 100644
--- a/tests/ref/fate/duck-dk3
+++ b/tests/ref/fate/adpcm-ima-dk3
diff --git a/tests/ref/fate/duck-dk4 b/tests/ref/fate/adpcm-ima-dk4
index d47ef2071a..d47ef2071a 100644
--- a/tests/ref/fate/duck-dk4
+++ b/tests/ref/fate/adpcm-ima-dk4
diff --git a/tests/ref/fate/qt-msimaadpcm-stereo b/tests/ref/fate/adpcm-ima_wav-stereo
index cb6a481999..cb6a481999 100644
--- a/tests/ref/fate/qt-msimaadpcm-stereo
+++ b/tests/ref/fate/adpcm-ima_wav-stereo
diff --git a/tests/ref/fate/psx-str-v3-adpcm_xa b/tests/ref/fate/adpcm-psx-str-v3
index ee0c3543d3..ee0c3543d3 100644
--- a/tests/ref/fate/psx-str-v3-adpcm_xa
+++ b/tests/ref/fate/adpcm-psx-str-v3
diff --git a/tests/ref/fate/thp-mjpeg-adpcm b/tests/ref/fate/adpcm-thp
index b1046d8df5..b1046d8df5 100644
--- a/tests/ref/fate/thp-mjpeg-adpcm
+++ b/tests/ref/fate/adpcm-thp
diff --git a/tests/ref/fate/qt-msadpcm-stereo b/tests/ref/fate/adpcm_ms-stereo
index 6b131c1f97..6b131c1f97 100644
--- a/tests/ref/fate/qt-msadpcm-stereo
+++ b/tests/ref/fate/adpcm_ms-stereo
diff --git a/tests/ref/fate/auravision b/tests/ref/fate/auravision-v1
index a7bccc0d2c..a7bccc0d2c 100644
--- a/tests/ref/fate/auravision
+++ b/tests/ref/fate/auravision-v1
diff --git a/tests/ref/fate/bink-demux-video b/tests/ref/fate/bink-video
index f3adf76b25..f3adf76b25 100644
--- a/tests/ref/fate/bink-demux-video
+++ b/tests/ref/fate/bink-video
diff --git a/tests/ref/fate/cvid b/tests/ref/fate/cvid-partial
index 9a85275c69..9a85275c69 100644
--- a/tests/ref/fate/cvid
+++ b/tests/ref/fate/cvid-partial
diff --git a/tests/ref/fate/idroq-video-dpcm b/tests/ref/fate/dpcm-idroq
index 7e0a10ee2e..7e0a10ee2e 100644
--- a/tests/ref/fate/idroq-video-dpcm
+++ b/tests/ref/fate/dpcm-idroq
diff --git a/tests/ref/fate/sierra-audio b/tests/ref/fate/dpcm-sierra
index 16f226e89e..16f226e89e 100644
--- a/tests/ref/fate/sierra-audio
+++ b/tests/ref/fate/dpcm-sierra
diff --git a/tests/ref/fate/feeble-dxa b/tests/ref/fate/dxa-feeble
index caea4c2e2a..caea4c2e2a 100644
--- a/tests/ref/fate/feeble-dxa
+++ b/tests/ref/fate/dxa-feeble
diff --git a/tests/ref/fate/gsm b/tests/ref/fate/gsm-toast
index 89f87d429f..89f87d429f 100644
--- a/tests/ref/fate/gsm
+++ b/tests/ref/fate/gsm-toast
diff --git a/tests/ref/fate/lossless-appleaudio b/tests/ref/fate/lossless-alac
index df27061615..df27061615 100644
--- a/tests/ref/fate/lossless-appleaudio
+++ b/tests/ref/fate/lossless-alac
diff --git a/tests/ref/fate/lossless-shortenaudio b/tests/ref/fate/lossless-shorten
index 9cdb3690e3..9cdb3690e3 100644
--- a/tests/ref/fate/lossless-shortenaudio
+++ b/tests/ref/fate/lossless-shorten
diff --git a/tests/ref/fate/lossless-wavpackaudio b/tests/ref/fate/lossless-wavpack
index 6281924c41..6281924c41 100644
--- a/tests/ref/fate/lossless-wavpackaudio
+++ b/tests/ref/fate/lossless-wavpack
diff --git a/tests/ref/fate/qt-rawpcm-16bit-stereo-signed-be b/tests/ref/fate/pcm_s16be-stereo
index 2500ba26f1..2500ba26f1 100644
--- a/tests/ref/fate/qt-rawpcm-16bit-stereo-signed-be
+++ b/tests/ref/fate/pcm_s16be-stereo
diff --git a/tests/ref/fate/qt-rawpcm-16bit-stereo-signed-le b/tests/ref/fate/pcm_s16le-stereo
index f0837d1206..f0837d1206 100644
--- a/tests/ref/fate/qt-rawpcm-16bit-stereo-signed-le
+++ b/tests/ref/fate/pcm_s16le-stereo
diff --git a/tests/ref/fate/qt-rawpcm-8bit-mono-unsigned b/tests/ref/fate/pcm_u8-mono
index 2b46dbc062..2b46dbc062 100644
--- a/tests/ref/fate/qt-rawpcm-8bit-mono-unsigned
+++ b/tests/ref/fate/pcm_u8-mono
diff --git a/tests/ref/fate/qt-rawpcm-8bit-stereo-unsigned b/tests/ref/fate/pcm_u8-stereo
index 701a515f3c..701a515f3c 100644
--- a/tests/ref/fate/qt-rawpcm-8bit-stereo-unsigned
+++ b/tests/ref/fate/pcm_u8-stereo
diff --git a/tests/ref/fate/fax-g3 b/tests/ref/fate/tiff-fax-g3
index b712dd2a8a..b712dd2a8a 100644
--- a/tests/ref/fate/fax-g3
+++ b/tests/ref/fate/tiff-fax-g3
diff --git a/tests/ref/fate/fax-g3s b/tests/ref/fate/tiff-fax-g3s
index b712dd2a8a..b712dd2a8a 100644
--- a/tests/ref/fate/fax-g3s
+++ b/tests/ref/fate/tiff-fax-g3s
diff --git a/tests/ref/fate/duck-tm2 b/tests/ref/fate/truemotion2
index e7c4ee47f4..e7c4ee47f4 100644
--- a/tests/ref/fate/duck-tm2
+++ b/tests/ref/fate/truemotion2
diff --git a/tests/ref/fate/vc1 b/tests/ref/fate/vc1_sa00040
index 901f81a97f..901f81a97f 100644
--- a/tests/ref/fate/vc1
+++ b/tests/ref/fate/vc1_sa00040
diff --git a/tests/ref/fate/video-xl b/tests/ref/fate/videoxl
index aca08645a7..aca08645a7 100644
--- a/tests/ref/fate/video-xl
+++ b/tests/ref/fate/videoxl
diff --git a/tests/ref/fate/vp3 b/tests/ref/fate/vp31
index 7c3d7d191a..7c3d7d191a 100644
--- a/tests/ref/fate/vp3
+++ b/tests/ref/fate/vp31