[FFmpeg-cvslog] Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 15 14:50:12 2014 +0200| [2c7d3ecfc962fe2d2afa84cd347136060468fe0e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c7d3ecfc962fe2d2afa84cd347136060468fe0e
---