Changeset 62101030 in ffmpeg

Timestamp:

Sep 15, 2011, 9:10:26 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

98b906e1

Parents:

e78d1a59 (diff), ea540401 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (09/15/11 21:10:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/15/11 21:10:26)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: swscale: fix byte overreads in SSE-optimized hscale(). matroskadec: fix typo. matroskadec: bail on parsing of incorrect seek index segments

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)