Changeset 5af0a701 in ffmpeg

Timestamp:

Nov 21, 2014, 8:26:01 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

15ed7ca4

Parents:

0c3ebbf6 (diff), aa8b39d9 (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/21/14 20:02:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/21/14 20:26:01)

Message:

Merge commit 'aa8b39d999589154f79300de9038994d0093cd34'

• commit 'aa8b39d999589154f79300de9038994d0093cd34': lavc: Move the libtwolame encoder registration to the list for external libraries

Conflicts:

libavcodec/allcodecs.c

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

(No files)