github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/mpegvideo_enc: Move dimension-alignment check to rv10enc.c

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-28 04:56:18 +02:00
parent 9051caa12c
commit 27d95c3cf8
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo_enc.c
View File

@@ -774,13 +774,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL);
}
if (s->c.codec_id == AV_CODEC_ID_RV10 &&
(avctx->width &15 ||
avctx->height&15 )) {
av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 16\n");
return AVERROR(EINVAL);
}
if ((s->c.codec_id == AV_CODEC_ID_WMV1 ||
s->c.codec_id == AV_CODEC_ID_WMV2) &&
avctx->width & 1) {

12
libavcodec/rv10enc.c
View File

@@ -66,6 +66,16 @@ int ff_rv10_encode_picture_header(MPVMainEncContext *const m)
return 0;
}
static av_cold int rv10_encode_init(AVCodecContext *avctx)
{
if ((avctx->width | avctx->height) & 15) {
av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 16\n");
return AVERROR(EINVAL);
}
return ff_mpv_encode_init(avctx);
}
const FFCodec ff_rv10_encoder = {
.p.name = "rv10",
CODEC_LONG_NAME("RealVideo 1.0"),
@@ -74,7 +84,7 @@ const FFCodec ff_rv10_encoder = {
.p.priv_class = &ff_mpv_enc_class,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.priv_data_size = sizeof(MPVMainEncContext),
.init = ff_mpv_encode_init,
.init = rv10_encode_init,
FF_CODEC_ENCODE_CB(ff_mpv_encode_picture),
.close = ff_mpv_encode_end,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,