diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 13:08:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 13:08:26 +0200 |
| commit | 088b410ea2eebcfdf57f7e0c419fe6be8d440eb6 (patch) | |
| tree | 0b1ce86c5af70c985d3f089f7cf55d632fdfece2 /libavformat | |
| parent | 6d9dfb1267d0a5b23ed3e857526bbca74223313a (diff) | |
| parent | 42bc768e5240ec01237ad2eb7c69b917158de258 (diff) | |
| download | ffmpeg-088b410ea2eebcfdf57f7e0c419fe6be8d440eb6.tar.gz | |
Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'
* commit '42bc768e5240ec01237ad2eb7c69b917158de258':
mpegts: Add jpeg2000 stream type
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 4a8a244a67..689b31da5c 100644 --- 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 }, |