Changeset 57fa9e97 in ffmpeg

Timestamp:

Jul 9, 2014, 9:26:18 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f2336668

Parents:

73b12830 (diff), 27c1f82f (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/09/14 21:26:09)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/09/14 21:26:18)

Message:

Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'

• commit '27c1f82f561932c83191bcd3e70e0cb1712485ba': nsvdec: remove commented out cruft

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

(No files)