[FFmpeg-cvslog] Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'

Michael Niedermayer git at videolan.org
Mon Nov 17 22:23:37 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 22:07:11 2014 +0100| [b5b15c4dd943fdb9fe57675a8926510be305223e] | committer: Michael Niedermayer

Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'

* commit 'fe5e6e34c05e274f98528be4f77f3c474473f977':
  lavf: Add an MPEG-DASH ISOFF segmenting muxer

Conflicts:
	Changelog
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5b15c4dd943fdb9fe57675a8926510be305223e
---





More information about the ffmpeg-cvslog mailing list