Changeset 43f92553 in ffmpeg

Timestamp:

Dec 11, 2013, 12:24:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

39d11d59

Parents:

4287466 (diff), 2a0fb728 (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> (12/11/13 00:21:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/11/13 00:24:35)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: alsdec: check block length

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

(No files)