From 4a423bed6d8428ed554476e1c84485b4c66f253b Mon Sep 17 00:00:00 2001
From: kostya <kostya@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Wed, 17 Dec 2008 19:39:56 +0000
Subject: [PATCH] Generate correct deblock pattern for RV30

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16191 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---
 libavcodec/rv34.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 6cf5869ab..feffa343a 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1109,7 +1109,15 @@ static int rv34_set_deblock_coef(RV34DecContext *r)
         hmvmask &= ~0x000F;
     if(!s->mb_x)
         vmvmask &= ~0x1111;
-    return hmvmask | vmvmask; //XXX: should be stored separately for RV3
+    if(r->rv30){ //RV30 marks both subblocks on the edge for filtering
+        vmvmask |= (vmvmask & 0x4444) >> 1;
+        hmvmask |= (hmvmask & 0x0F00) >> 4;
+        if(s->mb_x)
+            r->deblock_coefs[s->mb_x - 1 + s->mb_y*s->mb_stride] |= (vmvmask & 0x1111) << 3;
+        if(!s->first_slice_line)
+            r->deblock_coefs[s->mb_x + (s->mb_y - 1)*s->mb_stride] |= (hmvmask & 0xF) << 12;
+    }
+    return hmvmask | vmvmask;
 }
 
 static int rv34_decode_macroblock(RV34DecContext *r, int8_t *intra_types)
-- 
2.39.2