mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
avcodec/mpegvideo: Don't set unrestricted_mv for decoders
It is write-only for them. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
3988016fa3
commit
b263415ab7
@ -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 */
|
||||
|
@ -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:
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user