Merge commit '831005b2302cbeb377e3f00fd18c78928bcec185'

[ffmpeg] / libavcodec / xface.c

diff --git a/libavcodec/xface.c b/libavcodec/xface.c
index 8c0cbfdb84af3c42b9f5bda6660070cb6e874909..184c17417754ba84e2563c477b13edc6a2d304be 100644 (file)
--- a/libavcodec/xface.c
+++ b/libavcodec/xface.c
@@ -315,9 +315,9 @@ void ff_xface_generate_face(uint8_t *dst, uint8_t * const src)
 
             for (l = i - 2; l <= i + 2; l++) {
                 for (m = j - 2; m <= j; m++) {
-                    if (l >= i && m == j)
+                    if (l <= 0 || l >= i && m == j)
                         continue;
-                    if (l > 0 && l <= XFACE_WIDTH && m > 0)
+                    if (l <= XFACE_WIDTH && m > 0)
                         k = 2*k + src[l + m * XFACE_WIDTH];
                 }
             }