Merge remote-tracking branch 'qatar/master'

* qatar/master:
  simple_idct: simplify some ifdeffery
  simple_idct: remove code for DCTELEM != int16
  Remove VLAs in ff_amrwb_lsp2lpc()
  fate: make vsynth tests depend on only the relevant vref
  rtsp: remove disabled code
  dsputil: restore mistakenly removed hunk of disabled code

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

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/lsp.c
Simple merge

diff --cc libavcodec/lsp.h
Simple merge

diff --cc libavcodec/simple_idct.c
Simple merge

diff --cc libavformat/rtsp.c
Simple merge

diff --cc libavformat/rtsp.h
Simple merge

diff --cc libavformat/rtspdec.c
Simple merge