Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:53:22 +0000 (22:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:53:22 +0000 (22:53 +0100)
* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
libavformat/mpegtsenc.c

See: e2baaa21aabc7edb3c2275eac39ed1d40884b25a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge