Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 12:50:12 +0000 (14:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 16:20:17 +0000 (18:20 +0200)
commit2c7d3ecfc962fe2d2afa84cd347136060468fe0e
treec41ba636d60abccf4acaab315de41823967a033e
parent8b96f31817be57f0542834e7d6bdaecf2db6fd50
parentb70d7a4ac72d23f3448f3b08b770fdf5f57de222
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>
14 files changed:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/opus.c
libavcodec/opus.h
libavcodec/opus_celt.c
libavcodec/opus_imdct.c
libavcodec/opus_parser.c
libavcodec/opus_silk.c
libavcodec/opusdec.c
libavcodec/version.h
tests/Makefile
tests/fate/opus.mak