virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/avcodec: simplify codec id/type validity checking

Browse Source 
On entry to avcodec_open2(), the AVCodecContext type and id either have
to be UNKNOWN/NONE or have to match the codec to be used.
This commit is contained in:
Anton Khirnov
2022-03-23 14:11:03 +01:00
parent 4a7c8bb3d8
commit 7efa6418b8
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/avcodec.c
View File

@@ -158,16 +158,14 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
codec = avctx->codec; codec = avctx->codec;
codec2 = ffcodec(codec); codec2 = ffcodec(codec);
if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && if ((avctx->codec_type != AVMEDIA_TYPE_UNKNOWN && avctx->codec_type != codec->type) ||
avctx->codec_id == AV_CODEC_ID_NONE) { (avctx->codec_id != AV_CODEC_ID_NONE && avctx->codec_id != codec->id)) {
avctx->codec_type = codec->type;
avctx->codec_id = codec->id;
}
if (avctx->codec_id != codec->id || (avctx->codec_type != codec->type &&
avctx->codec_type != AVMEDIA_TYPE_ATTACHMENT)) {
av_log(avctx, AV_LOG_ERROR, "Codec type or id mismatches\n"); av_log(avctx, AV_LOG_ERROR, "Codec type or id mismatches\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
avctx->codec_type = codec->type;
avctx->codec_id = codec->id;
avctx->codec = codec; avctx->codec = codec;
if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE)