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)
* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
libavformat/mpegtsenc.c

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

Simple merge