. correction des conneries de BBP :)

 . typo dans src/interface/main.c

diff --git a/debian/rules b/debian/rules
index 25b6ccbee7288162e1be8465a1a1952e69fc341f..9643f4cfec7a706501b3ad53836d47ce66f937eb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ build-stamp:
        ./configure --prefix=/usr \
                --mandir=\$${prefix}/share/man \
                --infodir=\$${prefix}/share/info \
-               --with-ppro --with-mmx
+               --enable-ppro --enable-mmx --enable-gnome
        $(MAKE)
 
        touch build-stamp

diff --git a/debian/substvars b/debian/substvars
index c7ffe9bfd16a850ea32a9fbfc2d1ebd4e7e663b1..91b03d38b112f5efb4951a90262520b0051ae7e4 100644 (file)
--- a/debian/substvars
+++ b/debian/substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.1.2), xlib6g (>= 3.3.6-4)
+shlibs:Depends=gdk-imlib1 (>= 1.9.8.1-helix1), libart2 (>= 1.2.1-helix1), libaudiofile0, libc6 (>= 2.1.2), libdb2 (>= 1:2.4.14-7), libesd0 (>= 0.2.16) | libesd-alsa0 (>= 0.2.16), libglib1.2 (>= 1.2.0), libgnome32 (>= 1.2.1-helix1), libgnomesupport0 (>= 1.2.1-helix1), libgnomeui32 (>= 1.2.1-helix1), libgtk1.2 (>= 1.2.8-helix1), libz1, xlib6g (>= 3.3.6-4)

diff --git a/src/interface/main.c b/src/interface/main.c
index abf56ab03db9140f5750f761b4e34ed279a86102..018dc54072c301ae51b0b6c03c4d787d29a30fb3 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -480,7 +480,7 @@ static void Usage( int i_fashion )
               "      --aout <plugin>            \taudio output method\n"
               "      --stereo, --mono           \tstereo/mono audio\n"
               "\n"
-              "      --novideo                  \tdisable audio\n"
+              "      --novideo                  \tdisable video\n"
               "      --vout <plugin>            \tvideo output method\n"
               "      --display <display>        \tdisplay string\n"
               "      --width <w>, --height <h>  \tdisplay dimensions\n"

diff --git a/src/video_output/video_yuv.c b/src/video_output/video_yuv.c
index a85af890235cdb89903029ca71bfdf2dd3396670..4e74f8a09c0c48f36af212e81ff011e4db088c9a 100644 (file)
--- a/src/video_output/video_yuv.c
+++ b/src/video_output/video_yuv.c
@@ -313,6 +313,14 @@ static void     ConvertYUV444RGB32( p_vout_thread_t p_vout, u32 *p_pic, yuv_data
  * and 4 Bpp.
  *****************************************************************************/
 #define SCALE_HEIGHT( CHROMA, BPP )                                           \
+                                                                              \
+    /* If line is odd, rewind 4:2:0 U and V samples */                        \
+    if( ((CHROMA == 420) || (CHROMA == 422)) && !(i_y & 0x1) )                \
+    {                                                                         \
+        p_u -= i_chroma_width;                                                \
+        p_v -= i_chroma_width;                                                \
+    }                                                                         \
+                                                                              \
     /*                                                                        \
      * Handle vertical scaling. The current line can be copied or next one    \
      * can be ignored.                                                        \
@@ -331,7 +339,7 @@ static void     ConvertYUV444RGB32( p_vout_thread_t p_vout, u32 *p_pic, yuv_data
                     if( (i_scale_count -= i_pic_height) >= 0 )                \
                     {                                                         \
                         p_y += i_width;                                       \
-                        i_y+=2;                                               \
+                        i_y += 2;                                             \
                         p_u += i_chroma_width;                                \
                         p_v += i_chroma_width;                                \
                         continue;                                             \
@@ -359,7 +367,7 @@ static void     ConvertYUV444RGB32( p_vout_thread_t p_vout, u32 *p_pic, yuv_data
             }                                                                 \
             while( (i_scale_count -= i_pic_height) >= 0 )                     \
             {                                                                 \
-            /* Height reduction: skip next source line */                     \
+                /* Height reduction: skip next source line */                 \
                 p_y += i_width;                                               \
                 if( (CHROMA == 420) || (CHROMA == 422) )                      \
                 {                                                             \
@@ -437,7 +445,6 @@ static void     ConvertYUV444RGB32( p_vout_thread_t p_vout, u32 *p_pic, yuv_data
      * Handle vertical scaling. The current line can be copied or next one    \
      * can be ignored.                                                        \
      */                                                                       \
-                                                                              \
     switch( i_vertical_scaling )                                              \
     {                                                                         \
     case -1:                             /* vertical scaling factor is < 1 */ \