diff options
| author | Michael Niedermayer | 2013-07-02 11:50:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2013-07-02 11:50:30 +0200 |
| commit | 951a3655048095afbddf5e9f78ac8498636e2479 (patch) | |
| tree | b06d5244c254cffc9b5e35dd5f109f347b88a3c5 | |
| parent | d1fa6718952c4937f82653abe54bedb57555143a (diff) | |
| parent | 8ad3267ce3a1522a181946288049cc848cc9e351 (diff) | |
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>
| -rw-r--r-- | libavformat/oggdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index ad966e39d1..03a2618bec 100644 --- 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, }; |