From: Martin Zlomek <martin.zlomek@email.cz>
Date: Mon, 15 Oct 2007 06:23:02 +0000 (+0000)
Subject: Fix mix-up of values in r10690 (deblocking for PAFF).
X-Git-Tag: v0.5~7245
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44a7e65a517ecc18d6da6f6529dc909ef4cac3c7;p=coroid%2Flibav_saccubus.git

Fix mix-up of values in r10690 (deblocking for PAFF).

Patch by Martin Zlomek, martin d zlomek a email d cz

Originally committed as revision 10738 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 963399523..9a01fb67e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6443,9 +6443,9 @@ static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y,
                                               (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 );
         }
         if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
-            bSv[0][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
+            bSv[0][0] = 0x0004000400040004ULL;
         if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
-            bSv[1][0] = 0x0004000400040004ULL;
+            bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
 
 #define FILTER(hv,dir,edge)\
         if(bSv[dir][edge]) {\