diff options
| author | Michael Niedermayer <[email protected]> | 2012-06-09 21:13:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-06-09 21:13:58 +0200 |
| commit | 796039ad3807da88a443050fa16da313be3ce250 (patch) | |
| tree | a2a6d4e183557321e15d9726c15d569234caa10c /libavcodec/intelh263dec.c | |
| parent | a56b07b5dc4fdacbb038a9fc9d51e6b98e6d12d8 (diff) | |
| parent | 858c3158b58eafee2fedd9d83651c06aa57ef217 (diff) | |
Merge branch 'release/0.8' into release/0.7
* release/0.8:
Update for 0.8.12
mpc8: fix channel checks
h263: disable loop filter with lowres
wmv1: check that the input buffer is large enough
yopdec: check frame oddness to be within supported limits
yopdec: check that palette fits in the packet
8svx: fix crash
binkaudio: check number of channels
indeo5: check quant_mat
truemotion1: Check index, fix out of array read
iff: check if there is extradata
ape: Fix null ptr dereference with files missing a seekatable.
4xm: fix division by zero caused by bps<8
jvdec: check videosize
motionpixels: check extradata size
iff_ilbm: fix null ptr deref
yop: check for missing extradata
xan: fix out of array read
cdgraphics: Fix out of array write
Conflicts:
Doxyfile
RELEASE
VERSION
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/intelh263dec.c')
| -rw-r--r-- | libavcodec/intelh263dec.c | 2 |
1 files changed, 1 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)) |