Package: strigi
Version: 0.7.8-2
Severity: important
Tags: patch
User: pkg-multimedia-maintain...@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..24a314f
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,35 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+@@ -355,7 +355,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ #endif
+
+ if(fc->bit_rate)
+- ar.addValue(factory->bitrateProperty, fc->bit_rate);
++ ar.addValue(factory->bitrateProperty, (uint32_t)fc->bit_rate);
+ else if (fc->duration!= no_bitrate && fc->duration > 0) {
+ cout<<"Trying to estimate bitrate\n";
+ int64_t size;
+@@ -412,8 +412,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ if (size_t len = strlen(p->name)) {
+ ar.addTriplet(streamuri, codecPropertyName, string(p->name, len));
+ }
+- } else if (size_t len = strlen(codec.codec_name)) {
+- ar.addTriplet(streamuri, codecPropertyName, string(codec.codec_name, len));
++ } else if (size_t len = strlen(avcodec_get_name(codec.codec_id))) {
++ ar.addTriplet(streamuri, codecPropertyName, string(avcodec_get_name(codec.codec_id), len));
+ }
+ /*
+ 00792 } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
+@@ -486,7 +486,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ outs << stream.avg_frame_rate.num / stream.avg_frame_rate.den;
+ ar.addTriplet(streamuri, frameRatePropertyName, outs.str());
+ }
+- if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format
++ if (codec.pix_fmt != AV_PIX_FMT_NONE) {}//FIXME pixel format
+ }
+
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 75d761a..4458755 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
deepgrep_mayhem_fix.diff
libav10.patch
+ffmpeg_2.9.patch
_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-kde-extras
