Changeset 5ce070c1 in ffmpeg

Timestamp:

Nov 28, 2014, 11:50:38 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f001a2b

Parents:

21ff626c (diff), a9d8d35 (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.

Message:

Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'

• commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427': dashenc: Add options to make segment names configurable

Conflicts:

libavformat/dashenc.c

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

(No files)