Changeset db0384c9 in ffmpeg

Timestamp:

Jul 21, 2013, 10:58:26 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f229f9b

Parents:

0a28a52d (diff), fd818993 (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> (07/21/13 10:07:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/21/13 10:58:26)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: dsicinav: Clip the source size to the expected maximum

Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only

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

(No files)