r1218 - in /unstable/ffmpeg/debian: changelog patches/015_dont_provide_img_convert_in_avcodec_h.diff patches/series

[siretart at users.alioth.debian.org]

Author: siretart
Date: Sun Jun  1 16:40:45 2008
New Revision: 1218

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1218
Log:
* new patch: 015_dont_provide_img_convert_in_avcodec_h.diff. Since we build
  with CONFIG_SWSCALER, we don't have img_convert in libavcodec.so.
  So there is indeed no point in having that interface in the header file for the
  debian package.

Added:
    unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff
Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/patches/series

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1218&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Sun Jun  1 16:40:45 2008
@@ -20,6 +20,10 @@
   * new patch: 010_revert_r10648_disable_mfspr_emulation.diff. Commit r11569
     introduces an mfspr-based AltiVec detection code, which will break on
     machines not having altivec. (Closes: #482717)
+  * new patch: 015_dont_provide_img_convert_in_avcodec_h.diff. Since we build
+    with CONFIG_SWSCALER, we don't have img_convert in libavcodec.so.
+    So there is indeed no point in having that interface in the header file for the
+    debian package.
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 29 May 2008 16:17:54 +0200
 

Added: unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff?rev=1218&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff (added)
+++ unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff Sun Jun  1 16:40:45 2008
@@ -1,0 +1,32 @@
+See #483960 for details.
+
+Since we build with CONFIG_SWSCALER, we don't have img_convert in libavcodec.so.
+So there is indeed no point in having that interface in the header file for the
+debian package.
+
+TODO: It would be of course better if we could do some kind of
+"#ifndef CONFIG_SWSCALER" in avcodec.h. However we don't have the build-time
+config.h in the package, so there is some additional logic required to make it
+acceptable for upstream.
+
+Index: ffmpeg/libavcodec/avcodec.h
+===================================================================
+--- ffmpeg.orig/libavcodec/avcodec.h	2008-06-01 18:32:56.000000000 +0200
++++ ffmpeg/libavcodec/avcodec.h	2008-06-01 18:33:32.000000000 +0200
+@@ -2445,16 +2445,6 @@
+ int img_get_alpha_info(const AVPicture *src,
+                        int pix_fmt, int width, int height);
+ 
+-#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+-/**
+- * convert among pixel formats
+- * @deprecated Use the software scaler (swscale) instead.
+- */
+-attribute_deprecated int img_convert(AVPicture *dst, int dst_pix_fmt,
+-                const AVPicture *src, int pix_fmt,
+-                int width, int height);
+-#endif
+-
+ /* deinterlace a picture */
+ /* deinterlace - if not supported return -1 */
+ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1218&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Sun Jun  1 16:40:45 2008
@@ -4,5 +4,6 @@
 010_revert_r10648_disable_mfspr_emulation.diff
 011_link_plugins.diff
 013_strip_unneeded_linker_flags.diff
+015_dont_provide_img_convert_in_avcodec_h.diff
 020_fix_libswscale_pic_code
 300_c++_compliant_headers.diff