r836 - in /uniways/vlc/debian: changelog patches/series patches/uniways-grayscale-support.diff

[sho at users.alioth.debian.org]

Author: sho
Date: Wed Aug  1 08:33:36 2007
New Revision: 836

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=836
Log:
  * debian/patches/uniways-grayscale-support.diff:
    + Backported grayscale support.

Added:
    uniways/vlc/debian/patches/uniways-grayscale-support.diff
Modified:
    uniways/vlc/debian/changelog
    uniways/vlc/debian/patches/series

Modified: uniways/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/changelog?rev=836&op=diff
==============================================================================
--- uniways/vlc/debian/changelog (original)
+++ uniways/vlc/debian/changelog Wed Aug  1 08:33:36 2007
@@ -1,3 +1,10 @@
+vlc (0.8.6-svn20061012.debian-5uniways1) stable; urgency=low
+
+  * debian/patches/uniways-grayscale-support.diff:
+    + Backported grayscale support.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 01 Aug 2007 10:26:50 +0200
+
 vlc (0.8.6-svn20061012.debian-5etch1) stable-security; urgency=high
 
   * patch-formatstring-0.8.6debian-0.8.6c.diff:

Modified: uniways/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/patches/series?rev=836&op=diff
==============================================================================
--- uniways/vlc/debian/patches/series (original)
+++ uniways/vlc/debian/patches/series Wed Aug  1 08:33:36 2007
@@ -25,3 +25,4 @@
 patch-missingchecks-0.8.6debian-0.8.6c.diff
 patch-overflows-0.8.6debian-0.8.6c.diff
 patch-uninitialised-0.8.6debian-0.8.6c.diff
+uniways-grayscale-support.diff -p0

Added: uniways/vlc/debian/patches/uniways-grayscale-support.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/patches/uniways-grayscale-support.diff?rev=836&op=file
==============================================================================
--- uniways/vlc/debian/patches/uniways-grayscale-support.diff (added)
+++ uniways/vlc/debian/patches/uniways-grayscale-support.diff Wed Aug  1 08:33:36 2007
@@ -1,0 +1,51 @@
+Index: src/video_output/vout_pictures.h
+===================================================================
+--- src/video_output/vout_pictures.h	(revision 20924)
++++ src/video_output/vout_pictures.h	(revision 20925)
+@@ -99,3 +99,6 @@
+ 
+ /* Palettized YUV with palette element Y:U:V:A */
+ #define FOURCC_YUVP         VLC_FOURCC('Y','U','V','P')
++
++/* Planar 8-bit grayscale */
++#define FOURCC_GREY         VLC_FOURCC('G','R','E','Y')
+Index: src/video_output/vout_pictures.c
+===================================================================
+--- src/video_output/vout_pictures.c	(revision 20924)
++++ src/video_output/vout_pictures.c	(revision 20925)
+@@ -573,7 +573,6 @@
+         case FOURCC_UYVY:
+         case FOURCC_J422:
+             p_format->i_bits_per_pixel = 16;
+-            p_format->i_bits_per_pixel = 16;
+             break;
+         case FOURCC_I411:
+         case FOURCC_YV12:
+@@ -607,6 +606,11 @@
+         case FOURCC_RGB2:
+             p_format->i_bits_per_pixel = 8;
+             break;
++
++        case FOURCC_GREY:
++            p_format->i_bits_per_pixel = 8;
++            break;
++
+         default:
+             p_format->i_bits_per_pixel = 0;
+             break;
+@@ -832,6 +836,15 @@
+             p_pic->i_planes = 1;
+             break;
+ 
++        case FOURCC_GREY:
++            p_pic->p->i_lines = i_height_aligned;
++            p_pic->p->i_visible_lines = i_height;
++            p_pic->p->i_pitch = i_width_aligned;
++            p_pic->p->i_visible_pitch = i_width;
++            p_pic->p->i_pixel_pitch = 1;
++            p_pic->i_planes = 1;
++            break;
++
+         default:
+             msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)",
+                              i_chroma, (char*)&i_chroma );