Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 21:07:11 +0000 (22:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 21:13:50 +0000 (22:13 +0100)
commitb5b15c4dd943fdb9fe57675a8926510be305223e
tree30f5f63c75ba1f9d257260cf48738aa7b507949f
parent9e0b0c60bd7fa4d4a476b93f94436a8e37d98983
parentfe5e6e34c05e274f98528be4f77f3c474473f977
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@gmx.at>
Changelog
configure
libavformat/Makefile
libavformat/allformats.c
libavformat/dashenc.c
libavformat/version.h