[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Tue Jul 2 11:55:45 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 2 11:50:30 2013 +0200| [951a3655048095afbddf5e9f78ac8498636e2479] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=951a3655048095afbddf5e9f78ac8498636e2479
---
More information about the ffmpeg-cvslog
mailing list