[SCM] libav/experimental: Fix crop filter start_frame() for paletted formats different from PAL8. Shift data[1] only if the input format is not paletted.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5c3c0e3f2e2a1393bcc03967e005aa2d03b0cdd9
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Mon Nov 9 21:00:38 2009 +0000

    Fix crop filter start_frame() for paletted formats different from
    PAL8. Shift data[1] only if the input format is not paletted.
    
    Originally committed as revision 20488 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 0ff5f76..a47c8eb 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -176,7 +176,11 @@ static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
     ref2->data[0] += crop->y * ref2->linesize[0];
     ref2->data[0] += (crop->x * crop->bpp) >> 3;
 
-    if (link->format != PIX_FMT_PAL8) {
+    if (link->format != PIX_FMT_PAL8      &&
+        link->format != PIX_FMT_BGR4_BYTE &&
+        link->format != PIX_FMT_RGB4_BYTE &&
+        link->format != PIX_FMT_BGR8      &&
+        link->format != PIX_FMT_RGB8) {
         for (i = 1; i < 3; i ++) {
             if (ref2->data[i]) {
                 ref2->data[i] += (crop->y >> crop->vsub) * ref2->linesize[i];

-- 
Libav/FFmpeg packaging