Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 11:21:21 +0000 (13:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 11:21:21 +0000 (13:21 +0200)
commit780b1aa1efa872ec7401735764795134427db1ab
tree5499815afacb4c31b2d5611c1d712110c92fc4e7
parentcc61ef0479f07ddb9f22cbf3fa9ca28d6fd0cf72
parentf963f701d90bd7bb03e39aab4e59bd137084e082
Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'

* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
  ogg: relax demuxer conformance checks

Conflicts:
libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggdec.c