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)
* commit '42bc768e5240ec01237ad2eb7c69b917158de258':
  mpegts: Add jpeg2000 stream type

Conflicts:
libavformat/mpegts.c

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

@@@ -691,13 -581,9 +691,14 @@@ static const StreamType ISO_types[] = 
      { 0x04, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3        },
      { 0x0f, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC        },
      { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4      },
 +    /* Makito encoder sets stream type 0x11 for AAC,
 +     * so auto-detect LOAS/LATM instead of hardcoding it. */
 +#if !CONFIG_LOAS_DEMUXER
      { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM   }, /* LATM syntax */
 +#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      },