[FFmpeg-cvslog] Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 09:07:59 2013 +0200| [8dbf98e68a9b7d92705661a2d6900c6d914a8068] | committer: Michael Niedermayer

Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'

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

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

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

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