aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-01 17:07:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-01 17:07:07 +0200
commit0766b6e3ec6b7f51af5787421290284050e32a91 (patch)
tree2cd5a3e8b99e03a364a09f8c38a3e7dabfab81b1 /libavcodec/rv10.c
parentfebc013dc5d6db1535a4f91cf02fa8089038937c (diff)
downloadandroid_external_ffmpeg-0766b6e3ec6b7f51af5787421290284050e32a91.tar.gz
android_external_ffmpeg-0766b6e3ec6b7f51af5787421290284050e32a91.tar.bz2
android_external_ffmpeg-0766b6e3ec6b7f51af5787421290284050e32a91.zip
rv20: fix lowres out of array read
Fixes Ticket1239 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index f4ce1a38c9..5e9e01627a 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -349,7 +349,7 @@ static int rv20_decode_picture_header(RVDecContext *rv)
}
if(RV_GET_MINOR_VER(rv->sub_id) >= 2)
- s->loop_filter = get_bits1(&s->gb);
+ s->loop_filter = get_bits1(&s->gb) && !s->avctx->lowres;
if(RV_GET_MINOR_VER(rv->sub_id) <= 1)
seq = get_bits(&s->gb, 8) << 7;