Merge commit '8f8caca2'

* commit '8f8caca2': Add support for BDAV/m2ts-mode muxing Conflicts: libavformat/mpegtsenc.c See: 09a858daMerged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8f8caca2'
* commit '8f8caca2': Add support for BDAV/m2ts-mode muxing Conflicts: libavformat/mpegtsenc.c See: 09a858daMerged-by: Michael Niedermayer <michaelni@gmx.at>
d76adfae · Michael Niedermayer · fc469e5c · 8f8caca2 · d76adfae
Commit d76adfae authored Dec 02, 2014 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mpegtsenc.c libavformat/mpegtsenc.c +1 -1

No files found.
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c