Merge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:47:41 +0000 (22:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:47:41 +0000 (22:47 +0200)
commit9ae26ef9c3442b9c2cfa2c0f1bc346febd9a9499
tree32277f5f9b1d144aaf542b6d571f01a4ce2d500b
parentb9be91c03d274be5fa3fcd860ba37bb2fbeca429
parenteb89e1b98d3676aac1287d97c633b527c1ff4ea4
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@gmx.at>
libavformat/oggparseopus.c