summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-10 20:13:43 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-13 08:29:44 +0100
commitb263415ab7dcb0f7077fed2af4aa507b4be3e2f9 (patch)
tree76125eb2db5b77fda922f80c0857dff0aee72664
parent3988016fa3ec298206b9a5347683764f06ac31c6 (diff)
avcodec/mpegvideo: Don't set unrestricted_mv for decoders
It is write-only for them. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/flvdec.c1
-rw-r--r--libavcodec/h263dec.c2
-rw-r--r--libavcodec/intelh263dec.c1
-rw-r--r--libavcodec/ituh263dec.c2
-rw-r--r--libavcodec/rv10.c2
5 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 6258c1c0a7..2ddcf021fd 100644
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -90,7 +90,6 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
s->h263_plus = 0;
- s->unrestricted_mv = 1;
s->h263_long_vectors = 0;
/* PEI */
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 9cc2665cac..ac48acf47a 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -83,13 +83,11 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
s->quant_precision = 5;
s->decode_mb = ff_h263_decode_mb;
s->low_delay = 1;
- s->unrestricted_mv = 1;
/* select sub codec */
switch (avctx->codec->id) {
case AV_CODEC_ID_H263:
case AV_CODEC_ID_H263P:
- s->unrestricted_mv = 0;
avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
break;
case AV_CODEC_ID_MPEG4:
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index 7c794dc5e3..58c1b63c0a 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -66,7 +66,6 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
return -1; /* SAC: off */
}
s->obmc= get_bits1(&s->gb);
- s->unrestricted_mv = s->obmc || s->h263_long_vectors;
s->pb_frame = get_bits1(&s->gb);
if (format < 6) {
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 17af5d7f89..5329e62a5e 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -1150,7 +1150,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
return -1; /* SAC: off */
}
s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */
- s->unrestricted_mv = s->h263_long_vectors || s->obmc;
s->pb_frame = get_bits1(&s->gb);
s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
@@ -1180,7 +1179,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */
s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */
s->loop_filter= get_bits1(&s->gb);
- s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter;
if(s->avctx->lowres)
s->loop_filter = 0;
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index d8261c34c7..0dc2c87335 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -149,7 +149,6 @@ static int rv10_decode_picture_header(MpegEncContext *s)
}
skip_bits(&s->gb, 3); /* ignored */
s->f_code = 1;
- s->unrestricted_mv = 1;
return mb_count;
}
@@ -298,7 +297,6 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size)
skip_bits(&s->gb, 5);
s->f_code = 1;
- s->unrestricted_mv = 1;
s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I;
s->modified_quant = 1;
if (!s->avctx->lowres)