diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-03 14:41:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 21:08:13 +0200 |
| commit | 6a441ee78ee7bc49311994583455755663811243 (patch) | |
| tree | abf33ceefd901be56713f875e36dbcde5b591c47 | |
| parent | 316589e1db5a563533843994d4a074f3d667958d (diff) | |
| download | ffmpeg-6a441ee78ee7bc49311994583455755663811243.tar.gz | |
h263: disable loop filter with lowres
Fixes ticket1212
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc229d4e83889d1298f1a0863b55feec6c5c339a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/intelh263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index a011a9f597..a2ce68be78 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 b1e67231fd..634fd8a32b 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -961,6 +961,8 @@ int 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) { |