summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-03 14:41:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-03 15:01:34 +0200
commitcc229d4e83889d1298f1a0863b55feec6c5c339a (patch)
tree1cd80a375940c641363fe9a737531efb523b8b72 /libavcodec
parent169dae81145232514d7894264fc7d56822a81b04 (diff)
h263: disable loop filter with lowres
Fixes ticket1212 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/intelh263dec.c2
-rw-r--r--libavcodec/ituh263dec.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index 179f609de6..ffe91dbd5d 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -77,7 +77,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
}
if(get_bits(&s->gb, 2))
av_log(s->avctx, AV_LOG_ERROR, "Bad value for reserved field\n");
- s->loop_filter = get_bits1(&s->gb);
+ s->loop_filter = get_bits1(&s->gb) * !s->avctx->lowres;
if(get_bits1(&s->gb))
av_log(s->avctx, AV_LOG_ERROR, "Bad value for reserved field\n");
if(get_bits1(&s->gb))
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 34a9e816ae..58375becc9 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -963,6 +963,8 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
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;
s->h263_slice_structured= get_bits1(&s->gb);
if (get_bits1(&s->gb) != 0) {