Changeset d303e0af in ffmpeg

Timestamp:

Jul 19, 2011, 4:46:04 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

045ef52e

Parents:

257f274d (diff), 3e9409b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (07/19/11 16:45:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/19/11 16:46:04)

Message:

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>

(No files)