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)
commitb329460c5186d4520f1761211efa99fcf93cf538
treeafdc356e7f2e36d3ccd6d1bcd898da3c03fca9b2
parentd76adfae9cbcdfcfba6a11936feff22f9360dd49
parent7319a47c7e7931ebf8f475cc2cffc7bcd333acee
Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'

* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
libavformat/mpegtsenc.c

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