Package: lebiniou
Version: 3.22-1
Severity: important
Tags: patch
User: [email protected]
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..e6613eb
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,43 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <[email protected]>
+Last-Update: <2015-11-02>
+
+--- lebiniou-3.22.orig/plugins/stable/output/SDL/SDL.c
++++ lebiniou-3.22/plugins/stable/output/SDL/SDL.c
+@@ -83,8 +83,8 @@ SDL_refresh_32bpp(Context_t *ctx, SDL_Su
+ 
+ #ifndef FIXED
+   if (NULL == sws_context)
+-    sws_context = sws_getContext(WIDTH, HEIGHT, PIX_FMT_RGB32,
+-				 out_width, out_height, PIX_FMT_BGR32,
++    sws_context = sws_getContext(WIDTH, HEIGHT, AV_PIX_FMT_RGB32,
++				 out_width, out_height, AV_PIX_FMT_BGR32,
+ 				 SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   if (NULL == sws_context)
+     xerror("sws_getContext\n");
+--- lebiniou-3.22.orig/src/buffer_8bits.c
++++ lebiniou-3.22/src/buffer_8bits.c
+@@ -321,8 +321,8 @@ gray_scale(Pixel_t *grey_to, const uint1
+   struct SwsContext *sws_context = NULL;
+   int ret;
+ 
+-  sws_context = sws_getContext(width, height, PIX_FMT_GRAY8,
+-			       WIDTH, HEIGHT, PIX_FMT_GRAY8,
++  sws_context = sws_getContext(width, height, AV_PIX_FMT_GRAY8,
++			       WIDTH, HEIGHT, AV_PIX_FMT_GRAY8,
+ 			       SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   if (NULL == sws_context)
+     xerror("sws_getContext\n");
+--- lebiniou-3.22.orig/src/buffer_RGBA.c
++++ lebiniou-3.22/src/buffer_RGBA.c
+@@ -321,8 +321,8 @@ gray_scale(Pixel_t *grey_to, const uint1
+   uint8_t *srcSlice[4]={NULL,NULL,NULL,NULL}, *dst[4]={NULL,NULL,NULL,NULL};
+   int ret;
+ 
+-  sws_context = sws_getContext(width, height, PIX_FMT_GRAY8,
+-			       WIDTH, HEIGHT, PIX_FMT_GRAY8,
++  sws_context = sws_getContext(width, height, AV_PIX_FMT_GRAY8,
++			       WIDTH, HEIGHT, AV_PIX_FMT_GRAY8,
+ 			       SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   if (NULL == sws_context)
+     xerror("sws_getContext\n");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f762d21
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ffmpeg_2.9.patch

Reply via email to