Changeset 3ee83f46 in ffmpeg

Timestamp:

Sep 14, 2011, 7:57:47 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b34c7a56

Parents:

205c1368 (diff), 940173d4 (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/14/11 19:57:24)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/14/11 19:57:47)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: lavf utils: Remove write-only variable lavf utils: Rename shadowing variable smacker: fix a few off by 1 errors Check for invalid VLC value in smacker decoder. Check and propagate errors when VLC trees cannot be built in smacker decoder.

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

(No files)