Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:50:38 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:50:38 +0000 (12:50 +0100)
commit5ce070c16c728022b43c7e6d68e3068e2b446e33
tree4129cadb5c8feb846820cde5f20e365b5175643b
parent21ff626ce0a6f3adf4b387e622e54a57c8e90fb0
parenta9d8d35e4833fc4dfbf557ce73c84e9ca6224427
Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'

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

Conflicts:
libavformat/dashenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c