virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/ituh263enc: Don't use h263_plus field

Browse Source 
It is equal to codec_id == AV_CODEC_ID_H263P, check for that instead.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-05-21 02:17:25 +02:00
parent 8987c29390
commit da5c2a419b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ituh263enc.c
View File

@@ -233,7 +233,7 @@ static int h263_encode_picture_header(MPVMainEncContext *const m)
put_bits_assume_flushed(&s->pb); 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++){ for(i=0; i<2; i++){
int div, error; 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); 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 */ 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); 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 */ /* H.263v1 */
put_bits(&s->pb, 3, format); put_bits(&s->pb, 3, format);
put_bits(&s->pb, 1, (s->c.pict_type == AV_PICTURE_TYPE_P)); put_bits(&s->pb, 1, (s->c.pict_type == AV_PICTURE_TYPE_P));

1
libavcodec/mpegvideo_enc.c
View File

@@ -908,7 +908,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
break; break;
case AV_CODEC_ID_H263P: case AV_CODEC_ID_H263P:
s->c.out_format = FMT_H263; s->c.out_format = FMT_H263;
s->c.h263_plus = 1;
/* Fx */ /* Fx */
s->c.h263_aic = (avctx->flags & AV_CODEC_FLAG_AC_PRED) ? 1 : 0; s->c.h263_aic = (avctx->flags & AV_CODEC_FLAG_AC_PRED) ? 1 : 0;
s->c.modified_quant = s->c.h263_aic; s->c.modified_quant = s->c.h263_aic;