[FFmpeg-cvslog] Merge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 22:47:41 2014 +0200| [9ae26ef9c3442b9c2cfa2c0f1bc346febd9a9499] | committer: Michael Niedermayer

Merge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1

* commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
	libavformat/oggparseopus.c
	libavformat/version.h

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

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