[FFmpeg-cvslog] Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
Michael Niedermayer
git at videolan.org
Tue Dec 2 23:01:58 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 2 22:53:22 2014 +0100| [b329460c5186d4520f1761211efa99fcf93cf538] | committer: Michael Niedermayer
Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
mpegtsenc: recognize .mts as MPEG Transport Stream
Conflicts:
libavformat/mpegtsenc.c
See: e2baaa21aabc7edb3c2275eac39ed1d40884b25a
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b329460c5186d4520f1761211efa99fcf93cf538
---
More information about the ffmpeg-cvslog
mailing list