Control: reopen -1
Control: found -1 1:1.3-3
Hi Bertrand,
On 20.11.2015 12:39, Debian Bug Tracking System wrote:
> * Add a patch cherry-picked from upstream to fix FTBFS with FFmpeg 2.9
> (Closes: #803835).
Unfortunately this patch fixes only one half of the problem
(avcodec_*_frame -> av_frame_*), but not the other (PixelFormat ->
AVPixelFormat,
PIX_FMT_* -> AV_PIX_FMT_*).
For your convenience, I'm attaching a patch for the missing parts.
Best regards,
Andreas
diff --git a/debian/patches/ffmpeg_2.9_pixfmt.patch b/debian/patches/ffmpeg_2.9_pixfmt.patch
new file mode 100644
index 0000000..2687490
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9_pixfmt.patch
@@ -0,0 +1,51 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-28>
+
+--- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
+@@ -153,7 +153,7 @@ seek_cb (void *opaque,
+ static size_t
+ create_thumbnail (int src_width, int src_height,
+ int src_stride[],
+- enum PixelFormat src_pixfmt,
++ enum AVPixelFormat src_pixfmt,
+ const uint8_t * const src_data[],
+ int dst_width, int dst_height,
+ uint8_t **output_data,
+@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
+ if (NULL ==
+ (scaler_ctx =
+ sws_getContext (src_width, src_height, src_pixfmt,
+- dst_width, dst_height, PIX_FMT_RGB24,
++ dst_width, dst_height, AV_PIX_FMT_RGB24,
+ SWS_BILINEAR, NULL, NULL, NULL)))
+ {
+ #if DEBUG
+@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
+ return 0;
+ }
+ if (NULL == (dst_buffer =
+- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
++ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
+ {
+ #if DEBUG
+ fprintf (stderr,
+@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
+ return 0;
+ }
+ avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
+- PIX_FMT_RGB24, dst_width, dst_height);
++ AV_PIX_FMT_RGB24, dst_width, dst_height);
+ sws_scale (scaler_ctx,
+ src_data,
+ src_stride,
+@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
+ }
+ encoder_codec_ctx->width = dst_width;
+ encoder_codec_ctx->height = dst_height;
+- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
++ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
+ opts = NULL;
+ if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 62519f9..0dd7e92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
libgiflib5.1.patch
ffmpeg2.9.patch
+ffmpeg_2.9_pixfmt.patch
