Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/general: update supported devices table.
  doc/general: add missing @tab to codecs table.
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  avconv: reindent
  avconv: link '-passlogfile' option to libx264 'stats' AVOption.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  http: Clear the auth state on redirects
  http: Retry auth if it failed due to being stale
  rtsp: Resend new keepalive commands if they used stale auth
  rtsp: Retry authentication if failed due to being stale
  httpauth: Parse the stale field in digest auth
  dxva2_vc1: pass the overlap flag to the decoder
  dxva2_vc1: fix decoding of BI frames
  FATE: add shorthand to wavpack test
  dfa: convert to bytestream2 API
  anm decoder: move buffer allocation from decode_init() to decode_frame()
  h264: improve parsing of broken AVC SPS

Conflicts:
	ffmpeg.c
	libavcodec/anm.c
	libavcodec/dfa.c
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_ps.c

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

1 files changed, 29 insertions, 26 deletions

diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak
index 2807b26e95..bf18954877 100644
--- a/tests/fate/wavpack.mak
+++ b/tests/fate/wavpack.mak
@@ -1,87 +1,90 @@
 # Lossless
 
-FATE_TESTS += fate-wavpack-lossless-float
+FATE_WAVPACK += fate-wavpack-lossless-float
 fate-wavpack-lossless-float: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le
 
-FATE_TESTS += fate-wavpack-lossless-8bit
+FATE_WAVPACK += fate-wavpack-lossless-8bit
 fate-wavpack-lossless-8bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8
 
-FATE_TESTS += fate-wavpack-lossless-12bit
+FATE_WAVPACK += fate-wavpack-lossless-12bit
 fate-wavpack-lossless-12bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le
 
-FATE_TESTS += fate-wavpack-lossless-16bit
+FATE_WAVPACK += fate-wavpack-lossless-16bit
 fate-wavpack-lossless-16bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le
 
-FATE_TESTS += fate-wavpack-lossless-24bit
+FATE_WAVPACK += fate-wavpack-lossless-24bit
 fate-wavpack-lossless-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le
 
-FATE_TESTS += fate-wavpack-lossless-32bit
+FATE_WAVPACK += fate-wavpack-lossless-32bit
 fate-wavpack-lossless-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le
 
 # Lossy
 
-FATE_TESTS += fate-wavpack-lossy-float
+FATE_WAVPACK += fate-wavpack-lossy-float
 fate-wavpack-lossy-float: CMD = md5 -i $(SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le
 
-FATE_TESTS += fate-wavpack-lossy-8bit
+FATE_WAVPACK += fate-wavpack-lossy-8bit
 fate-wavpack-lossy-8bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8
 
-FATE_TESTS += fate-wavpack-lossy-16bit
+FATE_WAVPACK += fate-wavpack-lossy-16bit
 fate-wavpack-lossy-16bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le
 
-FATE_TESTS += fate-wavpack-lossy-24bit
+FATE_WAVPACK += fate-wavpack-lossy-24bit
 fate-wavpack-lossy-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le
 
-FATE_TESTS += fate-wavpack-lossy-32bit
+FATE_WAVPACK += fate-wavpack-lossy-32bit
 fate-wavpack-lossy-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le
 
 # Channel configurations
 
-FATE_TESTS += fate-wavpack-channels-monofloat
+FATE_WAVPACK += fate-wavpack-channels-monofloat
 fate-wavpack-channels-monofloat: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le
 
-FATE_TESTS += fate-wavpack-channels-monoint
+FATE_WAVPACK += fate-wavpack-channels-monoint
 fate-wavpack-channels-monoint: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le
 
-FATE_TESTS += fate-wavpack-channels-4.0
+FATE_WAVPACK += fate-wavpack-channels-4.0
 fate-wavpack-channels-4.0: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le
 
-FATE_TESTS += fate-wavpack-channels-5.1
+FATE_WAVPACK += fate-wavpack-channels-5.1
 fate-wavpack-channels-5.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le
 
-FATE_TESTS += fate-wavpack-channels-6.1
+FATE_WAVPACK += fate-wavpack-channels-6.1
 fate-wavpack-channels-6.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le
 
-FATE_TESTS += fate-wavpack-channels-7.1
+FATE_WAVPACK += fate-wavpack-channels-7.1
 fate-wavpack-channels-7.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le
 
 # Speed modes
 
-FATE_TESTS += fate-wavpack-speed-default
+FATE_WAVPACK += fate-wavpack-speed-default
 fate-wavpack-speed-default: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le
 
-FATE_TESTS += fate-wavpack-speed-fast
+FATE_WAVPACK += fate-wavpack-speed-fast
 fate-wavpack-speed-fast: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le
 
-FATE_TESTS += fate-wavpack-speed-high
+FATE_WAVPACK += fate-wavpack-speed-high
 fate-wavpack-speed-high: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le
 
-FATE_TESTS += fate-wavpack-speed-vhigh
+FATE_WAVPACK += fate-wavpack-speed-vhigh
 fate-wavpack-speed-vhigh: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le
 
 # Special Cases
 
-FATE_TESTS += fate-wavpack-cuesheet
+FATE_WAVPACK += fate-wavpack-cuesheet
 fate-wavpack-cuesheet: CMD = md5 -i $(SAMPLES)/wavpack/special/cue_sheet.wv -f s16le
 
-FATE_TESTS += fate-wavpack-zerolsbs
+FATE_WAVPACK += fate-wavpack-zerolsbs
 fate-wavpack-zerolsbs: CMD = md5 -i $(SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le
 
-FATE_TESTS += fate-wavpack-clipping
+FATE_WAVPACK += fate-wavpack-clipping
 fate-wavpack-clipping: CMD = md5 -i $(SAMPLES)/wavpack/special/clipping.wv -f s16le
 
-FATE_TESTS += fate-wavpack-falsestereo
+FATE_WAVPACK += fate-wavpack-falsestereo
 fate-wavpack-falsestereo: CMD = md5 -i $(SAMPLES)/wavpack/special/false_stereo.wv -f s16le
 
-FATE_TESTS += fate-wavpack-matroskamode
+FATE_WAVPACK += fate-wavpack-matroskamode
 fate-wavpack-matroskamode: CMD = md5 -i $(SAMPLES)/wavpack/special/matroska_mode.mka -f s16le
+
+FATE_TESTS += $(FATE_WAVPACK)
+fate-wavpack: $(FATE_WAVPACK)