diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 185baa3732..71a5bdfe90 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1696,11 +1696,13 @@ typedef struct AVCodecContext { #define FF_PROFILE_H264_HIGH_422 122 #define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA) #define FF_PROFILE_H264_STEREO_HIGH 128 +#define FF_PROFILE_H264_MULTIVIEW_HIGH_DEPTH 138 #define FF_PROFILE_H264_HIGH_444 144 #define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 #define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) #define FF_PROFILE_H264_CAVLC_444 44 + #define FF_PROFILE_VC1_SIMPLE 0 #define FF_PROFILE_VC1_MAIN 1 #define FF_PROFILE_VC1_COMPLEX 2 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 3bab86db62..552ec7d691 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1959,6 +1959,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_H264_MVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h264_mvc", + .long_name = NULL_IF_CONFIG_SMALL("H264 MVC"), + .props = AV_CODEC_PROP_LOSSY, + }, + /* various PCM "codecs" */ { .id = AV_CODEC_ID_PCM_S16LE, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index c8dc21da74..99c8e3f513 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -323,6 +323,8 @@ enum AVCodecID { AV_CODEC_ID_VMIX, AV_CODEC_ID_LEAD, + AV_CODEC_ID_H264_MVC, + /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_PCM_S16LE = 0x10000, diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 5bb8f150e6..1a683caceb 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -83,6 +83,7 @@ const AVProfile ff_h264_profiles[] = { { AV_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" }, { AV_PROFILE_H264_MULTIVIEW_HIGH, "Multiview High" }, { AV_PROFILE_H264_STEREO_HIGH, "Stereo High" }, + { FF_PROFILE_H264_MULTIVIEW_HIGH_DEPTH, "Multiview High Depth" }, { AV_PROFILE_UNKNOWN }, }; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 5571880ebe..ca7fee8627 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -815,7 +815,7 @@ static const StreamType ISO_types[] = { #endif { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, { 0x1c, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, - { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, + { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264_MVC }, { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, { 0x33, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC },