From a2ed87bd94e5be6aa1b587fb04ee92af5ba6edee Mon Sep 17 00:00:00 2001 From: blshkv Date: Wed, 25 Jan 2017 15:46:53 +0800 Subject: [PATCH] dff: ffmpeg3 patch for hpp file as well, issue 48 again --- .../{dff-1.3.0-r5.ebuild => dff-1.3.0-r6.ebuild} | 0 app-forensics/dff/files/1.3.0-ffmpeg3.patch | 15 +++++++++++++++ 2 files changed, 15 insertions(+) rename app-forensics/dff/{dff-1.3.0-r5.ebuild => dff-1.3.0-r6.ebuild} (100%) diff --git a/app-forensics/dff/dff-1.3.0-r5.ebuild b/app-forensics/dff/dff-1.3.0-r6.ebuild similarity index 100% rename from app-forensics/dff/dff-1.3.0-r5.ebuild rename to app-forensics/dff/dff-1.3.0-r6.ebuild diff --git a/app-forensics/dff/files/1.3.0-ffmpeg3.patch b/app-forensics/dff/files/1.3.0-ffmpeg3.patch index 27fcc99a4..3350c7332 100644 --- a/app-forensics/dff/files/1.3.0-ffmpeg3.patch +++ b/app-forensics/dff/files/1.3.0-ffmpeg3.patch @@ -118,3 +118,18 @@ Image_p image(new Image(this->_frame->data[0], this->_frame->linesize[0] * scaledHeight, scaledWidth, scaledHeight)); return (image); +diff -Naur 1/dff/api/gui/video/video.hpp 2/dff/api/gui/video/video.hpp +--- 1/dff/api/gui/video/video.hpp 2013-02-28 07:40:31.000000000 -0300 ++++ 2/dff/api/gui/video/video.hpp 2017-01-24 18:52:12.970983612 -0300 +@@ -89,9 +89,9 @@ + bool _decodeVideoPacket(void); + bool _getVideoPacket(void); + void _seek(int64_t seconds); +- void _convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int &scaledWidth, int &scaledHeight); ++ void _convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int &scaledWidth, int &scaledHeight); + void _calculateDimensions(int squareSize, bool maintainAspectRatio, int& destWidth, int& destHeight); +- void _createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, PixelFormat format); ++ void _createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, AVPixelFormat format); + Image_p _thumbnail(int32_t scale = 64); + public: + EXPOR