Commit 5ce070c1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a9d8d35e'

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

Conflicts:
	libavformat/dashenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 21ff626c a9d8d35e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment