Changeset fb3c33f3 in ffmpeg

Timestamp:

Feb 28, 2014, 8:41:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fe660374

Parents:

ffb7d719 (diff), 4cb69642 (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.

Message:

Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'

• commit '4cb6964244fd6c099383d8b7e99731e72cc844b9': dcadec: simplify decoding of VQ high frequencies

Conflicts:

configure
libavcodec/dcadec.c

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

(No files)