diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index b3f4e73e1d..a9f21f8152 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3838,9 +3838,10 @@ static const AVCodecDescriptor codec_descriptors[] = { }, { .id = AV_CODEC_ID_LCEVC, - .type = AVMEDIA_TYPE_DATA, + .type = AVMEDIA_TYPE_VIDEO, .name = "lcevc", .long_name = NULL_IF_CONFIG_SMALL("LCEVC (Low Complexity Enhancement Video Coding) / MPEG-5 LCEVC / MPEG-5 part 2"), + .props = AV_CODEC_PROP_ENHANCEMENT, }, { .id = AV_CODEC_ID_SMPTE_436M_ANC, diff --git a/libavcodec/version.h b/libavcodec/version.h index 26ee41eb1f..e99bd317e3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 26 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 76c251ac02..ee0ddddf8d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1065,9 +1065,8 @@ typedef struct AVStreamGroupTileGrid { * AVStreamGroupLCEVC is meant to define the relation between video streams * and a data stream containing LCEVC enhancement layer NALUs. * - * No more than one stream of @ref AVCodecParameters.codec_type "codec_type" - * AVMEDIA_TYPE_DATA shall be present, and it must be of - * @ref AVCodecParameters.codec_id "codec_id" AV_CODEC_ID_LCEVC. + * No more than one stream of + * @ref AVCodecParameters.codec_id "codec_id" AV_CODEC_ID_LCEVC shall be present. */ typedef struct AVStreamGroupLCEVC { const AVClass *av_class; diff --git a/libavformat/mov.c b/libavformat/mov.c index 1ae281440e..9b7df252b2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10802,8 +10802,6 @@ static int mov_parse_lcevc_streams(AVFormatContext *s) !(sc->tref_flags & MOV_TREF_FLAG_ENHANCEMENT)) continue; - st->codecpar->codec_type = AVMEDIA_TYPE_DATA; - stg = avformat_stream_group_create(s, AV_STREAM_GROUP_PARAMS_LCEVC, NULL); if (!stg) return AVERROR(ENOMEM); @@ -10811,8 +10809,6 @@ static int mov_parse_lcevc_streams(AVFormatContext *s) stg->id = st->id; stg->params.lcevc->width = st->codecpar->width; stg->params.lcevc->height = st->codecpar->height; - st->codecpar->width = 0; - st->codecpar->height = 0; while (st_base = mov_find_reference_track(s, st, j)) { err = avformat_stream_group_add_stream(stg, st_base);