Merge remote-tracking branch 'qatar/master'

* qatar/master: oggdec: do not fall back on binary search in the generic code. Conflicts: libavformat/oggdec.c tests/ref/seek/lavf-ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 951a365504
parent d1fa671895 8ad3267ce3
commit 951a365504
1 changed files with 1 additions and 1 deletions
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@ -859,5 +859,5 @@ AVInputFormat ff_ogg_demuxer = {
    .read_seek      = ogg_read_seek,
    .read_timestamp = ogg_read_timestamp,
    .extensions     = "ogg",
-    .flags          = AVFMT_GENERIC_INDEX | AVFMT_TS_DISCONT,
+    .flags          = AVFMT_GENERIC_INDEX | AVFMT_TS_DISCONT | AVFMT_NOBINSEARCH,
 };