Changeset 0d35d5ab in ffmpeg

Timestamp:

Jul 3, 2014, 6:37:06 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

524eeaca

Parents:

d538dd82 (diff), 6bc4934b (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/03/14 18:37:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/03/14 18:37:06)

Message:

Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

• commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e': ismindex: Allow adding a path prefix to the generated .ism file

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

(No files)