Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jul 2013 09:50:30 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jul 2013 09:50:30 +0000 (11:50 +0200)
* 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>
1  2 
libavformat/oggdec.c

@@@ -859,5 -704,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_NOBINSEARCH,
++    .flags          = AVFMT_GENERIC_INDEX | AVFMT_TS_DISCONT | AVFMT_NOBINSEARCH,
  };