Changeset 4fecf170 in ffmpeg

Timestamp:

Nov 24, 2014, 12:10:16 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1db2d39d

Parents:

bcaef717 (diff), 30b8eb0f (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> (11/24/14 12:09:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/24/14 12:10:16)

Message:

Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'

• commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b': sol: simplify sol_codec_id()

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

(No files)