diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-09-16 11:22:24 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-09-16 11:22:52 +0200 |
| commit | 0f4e8fb9c667cb2248fb7e5dc51000cacd375a21 (patch) | |
| tree | a8abf2d114ddbace7643485c4621650bcb2a188e /app-misc | |
| parent | Merge branch 'marbre-glm' (diff) | |
| download | gentoo-0f4e8fb9c667cb2248fb7e5dc51000cacd375a21.tar.gz gentoo-0f4e8fb9c667cb2248fb7e5dc51000cacd375a21.tar.bz2 gentoo-0f4e8fb9c667cb2248fb7e5dc51000cacd375a21.zip | |
app-misc/strigi: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch | 21 | ||||
| -rw-r--r-- | app-misc/strigi/strigi-0.7.8-r1.ebuild | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch b/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch new file mode 100644 index 000000000000..ec5a6dead3f8 --- /dev/null +++ b/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch @@ -0,0 +1,21 @@ +Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp +=================================================================== +--- 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, (int)fc->bit_rate); + else if (fc->duration!= no_bitrate && fc->duration > 0) { + cout<<"Trying to estimate bitrate\n"; + int64_t size; +@@ -486,7 +486,6 @@ 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 + } + + } diff --git a/app-misc/strigi/strigi-0.7.8-r1.ebuild b/app-misc/strigi/strigi-0.7.8-r1.ebuild index 35bc48b5216b..4f7694f8bc00 100644 --- a/app-misc/strigi/strigi-0.7.8-r1.ebuild +++ b/app-misc/strigi/strigi-0.7.8-r1.ebuild @@ -51,6 +51,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-gcc-4.8.patch" "${FILESDIR}/${P}-libav10.patch" + "${FILESDIR}/${P}-ffmpeg29.patch" ) if [[ ${PV} == 9999 ]] ; then |