Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'

* commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts: Add jpeg2000 stream type Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 088b410ea2
parent 6d9dfb1267 42bc768e52
commit 088b410ea2
1 changed files with 1 additions and 0 deletions
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@ -698,6 +698,7 @@ static const StreamType ISO_types[] = {
 #endif
    { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264       },
    { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264       },
+    { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000   },
    { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC       },
    { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS       },
    { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC      },