From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 19 Jul 2011 16:45:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: rel20110916_inqubus2.b.0~6^2~70
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d303e0affd9274381a098da55ef4eca954f23b74;p=coroid%2Fffmpeg_saccubus.git

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>
---

d303e0affd9274381a098da55ef4eca954f23b74