Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:07:59 +0000 (09:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:09:43 +0000 (09:09 +0200)
commit8dbf98e68a9b7d92705661a2d6900c6d914a8068
tree13c9f40f1470f0cb498dc466216f6533d978ef29
parent3ce0eddeab39bf04748c1153ae096e81facd0a6d
parentecab1c77410f023b437c6ed3a3281be8f039e574
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@gmx.at>
libavformat/oggparseopus.c