* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082': ogg: relax demuxer conformance checks Conflicts: libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>