Changeset 4d10b93 in ffmpeg

Timestamp:

Mar 14, 2014, 6:24:09 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a8a84fa8

Parents:

11e66d20 (diff), d42ea067 (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> (03/14/14 18:23:57)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/14/14 18:24:09)

Message:

Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'

• commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43': codec_desc: add missing .long_name

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

(No files)