r831 - in /unstable/ffmpeg/debian: changelog patches/051_mjpeg_gray_support.diff

[sho at users.alioth.debian.org]

Author: sho
Date: Tue Jul 31 16:56:07 2007
New Revision: 831

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=831
Log:
  * debian/patches/051_mjpeg_gray_support.diff:
    + Support grayscale MJPEG streams as sent by Axis cameras.

Added:
    unstable/ffmpeg/debian/patches/051_mjpeg_gray_support.diff
Modified:
    unstable/ffmpeg/debian/changelog

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=831&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Jul 31 16:56:07 2007
@@ -1,3 +1,10 @@
+ffmpeg-free (0.cvs20070307-7) UNRELEASED; urgency=low
+
+  * debian/patches/051_mjpeg_gray_support.diff:
+    + Support grayscale MJPEG streams as sent by Axis cameras.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 31 Jul 2007 18:55:31 +0200
+
 ffmpeg-free (0.cvs20070307-6) unstable; urgency=low
 
   * Rename the source package. We are (again) no longer shipping the

Added: unstable/ffmpeg/debian/patches/051_mjpeg_gray_support.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/051_mjpeg_gray_support.diff?rev=831&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/051_mjpeg_gray_support.diff (added)
+++ unstable/ffmpeg/debian/patches/051_mjpeg_gray_support.diff Tue Jul 31 16:56:07 2007
@@ -1,0 +1,10 @@
+--- ../ffmpeg-orig/libavcodec/mjpeg.c	2007-06-23 16:14:45 +0200
++++ ../ffmpeg-free-0.cvs20070307/libavcodec/mjpeg.c	2007-07-30 15:52:26 +0200
+@@ -1216,6 +1216,7 @@
+     switch(pix_fmt_id){
+     case 0x222222:
+     case 0x111111:
++    case 0x110000:
+         if(s->rgb){
+             s->avctx->pix_fmt = PIX_FMT_RGB32;
+         }else if(s->nb_components==3)