diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-03 14:41:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:49:58 +0200 |
| commit | ddd9483a105a1b51e23fef0975b69cdf1052a0ce (patch) | |
| tree | 32e8048c6a12fef59bc8e0b48f7daa78f2870409 | |
| parent | 9c13d232a4ba858b3082127d9b332f0dd5595ace (diff) | |
| download | ffmpeg-ddd9483a105a1b51e23fef0975b69cdf1052a0ce.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 836e98ee88..6309bcf284 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 9c81bcbd0b..a4474d32a2 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -963,6 +963,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) { |