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)
commit951a3655048095afbddf5e9f78ac8498636e2479
treeb06d5244c254cffc9b5e35dd5f109f347b88a3c5
parentd1fa6718952c4937f82653abe54bedb57555143a
parent8ad3267ce3a1522a181946288049cc848cc9e351
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>
libavformat/oggdec.c