Changeset 2c7d3ecf in ffmpeg

Timestamp:

May 15, 2014, 4:20:17 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

96cb4c87

Parents:

8b96f318 (diff), b70d7a4a (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> (05/15/14 12:50:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/15/14 16:20:17)

Message:

Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'

• commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222': lavc: add a native Opus decoder.

Conflicts:

Changelog
configure
libavcodec/version.h

Fate tests pass with both avresample as well as swresample based opus decoder, but
are disabled (reference files are very large so i want to think a day or 2 about
if theres an alternative or if they could be avoided, they also dont match the
official samples)

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

(No files)