Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:39:01 +0000 (22:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:42:35 +0000 (22:42 +0100)
commitd76adfae9cbcdfcfba6a11936feff22f9360dd49
treeafdc356e7f2e36d3ccd6d1bcd898da3c03fca9b2
parentfc469e5c7f4ab477af17bc11e32472a29cf050db
parent8f8caca2242e1fe05f37493cfabcd3f4de198550
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'

* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
libavformat/mpegtsenc.c

See: 09a858da7d5535e78e9cf942a468aec411ffbf19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegtsenc.c