diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-02 11:50:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-02 11:50:30 +0200 |
| commit | 951a3655048095afbddf5e9f78ac8498636e2479 (patch) | |
| tree | b06d5244c254cffc9b5e35dd5f109f347b88a3c5 /libavutil/aes.c | |
| parent | d1fa6718952c4937f82653abe54bedb57555143a (diff) | |
| parent | 8ad3267ce3a1522a181946288049cc848cc9e351 (diff) | |
| download | ffmpeg-951a3655048095afbddf5e9f78ac8498636e2479.tar.gz | |
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>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions