Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 11:08:26 +0000 (13:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 11:08:26 +0000 (13:08 +0200)
commit088b410ea2eebcfdf57f7e0c419fe6be8d440eb6
tree0b1ce86c5af70c985d3f089f7cf55d632fdfece2
parent6d9dfb1267d0a5b23ed3e857526bbca74223313a
parent42bc768e5240ec01237ad2eb7c69b917158de258
Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'

* commit '42bc768e5240ec01237ad2eb7c69b917158de258':
  mpegts: Add jpeg2000 stream type

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c