ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Nov 28
12:50:38 2014 +0100| [5ce070c16c728022b43c7e6d68e3068e2b446e33] | committer:
Michael Niedermayer
Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'
* commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427':
dashenc: Add options to make segment names configurable
Conflicts:
libavformat/dashenc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ce070c16c728022b43c7e6d68e3068e2b446e33
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
