From 4e9bf9aaf3858d0aac300b2d20d3d42c18a78950 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Wed, 21 May 2025 02:17:25 +0200
Subject: [PATCH 17/19] avcodec/ituh263enc: Don't use h263_plus field
It is equal to codec_id == AV_CODEC_ID_H263P, check for that instead.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/ituh263enc.c | 4 ++--
libavcodec/mpegvideo_enc.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 9a6d5dc201..4fdf9cf402 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -233,7 +233,7 @@ static int h263_encode_picture_header(MPVMainEncContext *const m)
put_bits_assume_flushed(&s->pb);
- if(s->c.h263_plus){
+ if (s->c.codec_id == AV_CODEC_ID_H263P) {
for(i=0; i<2; i++){
int div, error;
div= (s->c.avctx->time_base.num*1800000LL + 500LL*s->c.avctx->time_base.den) / ((1000LL+i)*s->c.avctx->time_base.den);
@@ -262,7 +262,7 @@ static int h263_encode_picture_header(MPVMainEncContext *const m)
put_bits(&s->pb, 1, 0); /* freeze picture release off */
format = ff_match_2uint16(ff_h263_format, FF_ARRAY_ELEMS(ff_h263_format), s->c.width, s->c.height);
- if (!s->c.h263_plus) {
+ if (s->c.codec_id != AV_CODEC_ID_H263P) {
/* H.263v1 */
put_bits(&s->pb, 3, format);
put_bits(&s->pb, 1, (s->c.pict_type == AV_PICTURE_TYPE_P));
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index e0b7ea0846..75229dad73 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -907,7 +907,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
break;
case AV_CODEC_ID_H263P:
s->c.out_format = FMT_H263;
- s->c.h263_plus = 1;
/* Fx */
s->c.h263_aic = (avctx->flags & AV_CODEC_FLAG_AC_PRED) ? 1 : 0;
s->c.modified_quant = s->c.h263_aic;
--
2.45.2