[FFmpeg-cvslog] Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 23 13:21:21 2013 +0200| [780b1aa1efa872ec7401735764795134427db1ab] | committer: Michael Niedermayer

Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'

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

Conflicts:
	libavformat/oggdec.c

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

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