Attachment 169353 Details for Bug 208816 – Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x

[patch] Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x

libstreamanalyzer.diff (text/plain), 2.19 KB, created by Ben Woods on 2016-04-15 16:49:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2016-04-15 16:49:19 UTC

Size: 2.19 KB

patch

obsolete

>Index: deskutils/libstreamanalyzer/files/patch-ffmpeg29
>===================================================================
>--- deskutils/libstreamanalyzer/files/patch-ffmpeg29	(nonexistent)
>+++ deskutils/libstreamanalyzer/files/patch-ffmpeg29	(working copy)
>@@ -0,0 +1,35 @@
>+Description: Replace deprecated FFmpeg API
>+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
>+Last-Update: <2015-11-02>
>+
>+--- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig
>++++ 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
>+       }
>+       
>+     }
>
>Property changes on: deskutils/libstreamanalyzer/files/patch-ffmpeg29
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

rakuco: maintainer-approval+

Actions: View | Diff

Attachments on bug 208816: 169337 | 169338 | 169353 | 169354 | 169355