[FFmpeg-cvslog] rv20: fix lowres out of array read

Michael Niedermayer git at videolan.org
Thu Jun 7 01:44:19 CEST 2012


ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  1 17:07:07 2012 +0200| [af67af59382f0ea76abc5327af0fe44bae4c4323] | committer: Michael Niedermayer

rv20: fix lowres out of array read

Fixes Ticket1239

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0766b6e3ec6b7f51af5787421290284050e32a91)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af67af59382f0ea76abc5327af0fe44bae4c4323
---

 libavcodec/rv10.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index f4ce1a3..5e9e016 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;



More information about the ffmpeg-cvslog mailing list