Your message dated Tue, 24 Nov 2015 19:50:32 +0000
with message-id <e1a1jbk-0007ms...@franck.debian.org>
and subject line Bug#803860: fixed in shotdetect 1.0.86-5
has caused the Debian Bug report #803860,
regarding shotdetect: FTBFS with FFmpeg 2.9
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
803860: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803860
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: shotdetect
Version: 1.0.86-4
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
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..5a75ef0
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,68 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- shotdetect-1.0.86.orig/src/film.cpp
++++ shotdetect-1.0.86/src/film.cpp
+@@ -292,14 +292,14 @@ film::process ()
+       /*
+        * Allocate video frame 
+        */
+-      pFrame = avcodec_alloc_frame ();
+-      pFrameRGB = avcodec_alloc_frame ();
+-      pFrameRGBprev = avcodec_alloc_frame ();
++      pFrame = av_frame_alloc ();
++      pFrameRGB = av_frame_alloc ();
++      pFrameRGBprev = av_frame_alloc ();
+ 
+       /*
+        * Determine required buffer size and allocate buffer 
+        */
+-      numBytes = avpicture_get_size (PIX_FMT_RGB24, width, height);
++      numBytes = avpicture_get_size (AV_PIX_FMT_RGB24, width, height);
+ 
+       buffer = (uint8_t *) malloc (sizeof (uint8_t) * numBytes);
+       buffer2 = (uint8_t *) malloc (sizeof (uint8_t) * numBytes);
+@@ -307,9 +307,9 @@ film::process ()
+       /*
+        * Assign appropriate parts of buffer to image planes in pFrameRGB 
+        */
+-      avpicture_fill ((AVPicture *) pFrameRGB, buffer, PIX_FMT_RGB24, width, height);
++      avpicture_fill ((AVPicture *) pFrameRGB, buffer, AV_PIX_FMT_RGB24, width, height);
+ 
+-      avpicture_fill ((AVPicture *) pFrameRGBprev, buffer2, PIX_FMT_RGB24, width, height);
++      avpicture_fill ((AVPicture *) pFrameRGBprev, buffer2, AV_PIX_FMT_RGB24, width, height);
+ 
+ 
+       /*
+@@ -351,7 +351,7 @@ film::process ()
+ 	      if (! img_convert_ctx)
+ 		{
+ 		  img_convert_ctx = sws_getContext(width, height, pCodecCtx->pix_fmt,
+-						   width, height, PIX_FMT_RGB24, SWS_BICUBIC, 
++						   width, height, AV_PIX_FMT_RGB24, SWS_BICUBIC, 
+ 						   NULL, NULL, NULL);
+ 		  if (! img_convert_ctx) 
+ 		  {
+@@ -374,7 +374,7 @@ film::process ()
+ 				int src_width, int src_height)
+ 	      */
+ 	      /*
+-	      img_convert ((AVPicture *) pFrameRGB, PIX_FMT_RGB24, (AVPicture *) pFrame, pCodecCtx->pix_fmt, width, height);
++	      img_convert ((AVPicture *) pFrameRGB, AV_PIX_FMT_RGB24, (AVPicture *) pFrame, pCodecCtx->pix_fmt, width, height);
+ 	      */
+ 
+             this->frame_number ++;
+@@ -437,9 +437,9 @@ film::process ()
+        */
+       free (buffer);
+       free (buffer2);
+-      av_free (pFrameRGB);
+-      av_free (pFrame);
+-      av_free (pFrameRGBprev);
++      av_frame_free (&pFrameRGB);
++      av_frame_free (&pFrame);
++      av_frame_free (&pFrameRGBprev);
+       avcodec_close (pCodecCtx);
+     }
+   /*
diff --git a/debian/patches/series b/debian/patches/series
index a9283dd..777acd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 1004-fix_comments_and_names.patch
 
 libav10.patch
+ffmpeg_2.9.patch

--- End Message ---
--- Begin Message ---
Source: shotdetect
Source-Version: 1.0.86-5

We believe that the bug you reported is fixed in the latest version of
shotdetect, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 803...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Giulio Paci <giuliop...@gmail.com> (supplier of updated shotdetect package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Tue, 24 Nov 2015 20:37:42 +0100
Source: shotdetect
Binary: shotdetect
Architecture: source
Version: 1.0.86-5
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers 
<pkg-multimedia-maintainers@lists.alioth.debian.org>
Changed-By: Giulio Paci <giuliop...@gmail.com>
Description:
 shotdetect - scene change detector
Closes: 803860
Changes:
 shotdetect (1.0.86-5) unstable; urgency=medium
 .
   [ Sebastian Ramacher ]
   * Remove myself from Uploaders.
 .
   [ Giulio Paci ]
   * Add 1008-fix-FTBFS-ffmpeg_2.9.patch (Closes: #803860).
   * Bump Standards-Version to 3.9.6.
     No changes needed.
Checksums-Sha1:
 5f2c5c4347ccf07e6ad0e19689f99e91c7bd44f4 2179 shotdetect_1.0.86-5.dsc
 a464ce47f60aec47f3b17903e403b46f472d7ad0 12072 
shotdetect_1.0.86-5.debian.tar.xz
Checksums-Sha256:
 a5d4d468df0613a39c2e3d53dab4c7a96f4cabf82c9f5db9b2797cbfefb18234 2179 
shotdetect_1.0.86-5.dsc
 4845a52ff52cd4bfa084d917b3a21f801dbfa8f0145664a2f3db0ea389546d9e 12072 
shotdetect_1.0.86-5.debian.tar.xz
Files:
 498b0ad4694c93eee2c7faf6de28a238 2179 video optional shotdetect_1.0.86-5.dsc
 be16de34772ca52fce55ff2c8f6d7dfe 12072 video optional 
shotdetect_1.0.86-5.debian.tar.xz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJWVL1SAAoJEGny/FFupxmTlj4QALBqN1o/jHhQBYJw6UaEyC8v
xyVDOEyYtWNUaAc65PMbkXQZcI+mOnt7sfKJ1Y+qE3l8tIcXI8dCBRP7ZOgEoj1d
KtdFl9TDgzaIxOy3k56TCwcRGXhFFK8ap+KuSBADqxfMr+yCoR5EEl105r+aR5p0
tOJYKv4ACU2ua6AQtcda14Oi4SZwNUEtjiYeRNJcPMU/pHsO2C54B+FoGzNkVGUk
Gt8JvAYIeYsTRGiIwI/cQ8tTNESdGCq5xhWlexxvet2R9SuZN8I0jWEN3sWzPxCk
8u6t2nO7XsGWFZRPURXjR5SCG6EWpcKQ5Wk5QW+FLehCMiMmuYyJsUbdMG2eB5gv
HVZXaO2z5zNzjEyCw+u0QEoi9JrIGa5zGqpM5dz2YOPBIAQNX/MsR4NF81QAVSiE
C6cr8Bd9p/S9JCceAYxK+CqdBqxSRfmWXbOZMH+DSD4wpq3IiIYb51i2Bd35yqxY
YGpH28umZ/sO91Zzl5SzH9kmm8wzskQuiua94guAVPcq6rS/iLLXRceke//MNhcq
8zsAD948tjnlNf6q2HIaiTnNtTPGbvtfq4CET2+LemC/hKUOcZqMAm23rDC8p9Dr
CakG8Y/DYgxE5Fo6ALss2IfzNfPvOf4FDDhyYYB8kZA7JC5zeTNkumHx+xXs1D9M
Y0zoJ7Em1jEAEgxHAfYn
=I/dV
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to