Changeset 951a3655 in ffmpeg

Timestamp:

Jul 2, 2013, 9:50:30 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a478e99a

Parents:

d1fa6718 (diff), 8ad3267 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)