[FFmpeg-cvslog] Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 13:08:26 2015 +0200| [088b410ea2eebcfdf57f7e0c419fe6be8d440eb6] | committer: Michael Niedermayer

Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'

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

Conflicts:
	libavformat/mpegts.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=088b410ea2eebcfdf57f7e0c419fe6be8d440eb6
---