Changeset e86f754b in ffmpeg

Timestamp:

Feb 16, 2015, 1:16:29 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9d4f8366

Parents:

39b40be2 (diff), 70245853 (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 '702458538d4e52809bcef460d39baabf061b16b5'

• commit '702458538d4e52809bcef460d39baabf061b16b5': g722: Add ARM NEON implementation for g722_apply_qmf()

Conflicts:

libavcodec/arm/Makefile

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

(No files)