Hello community, here is the log from the commit of package ffmpegthumbs for openSUSE:Factory checked in at 2018-11-13 16:38:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpegthumbs (Old) and /work/SRC/openSUSE:Factory/.ffmpegthumbs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpegthumbs" Tue Nov 13 16:38:44 2018 rev:43 rq:647970 version:18.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpegthumbs/ffmpegthumbs.changes 2018-11-06 14:37:26.596772455 +0100 +++ /work/SRC/openSUSE:Factory/.ffmpegthumbs.new/ffmpegthumbs.changes 2018-11-13 17:09:29.970905796 +0100 @@ -1,0 +2,12 @@ +Thu Nov 08 20:43:28 UTC 2018 - lbeltr...@kde.org + +- Update to 18.08.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.3.php +- Changes since 18.08.2: + * Don't crash if initializeVideo fails +- Dropped patches, now upstream: + * 0001-Don-t-crash-if-initializeVideo-fails.patch + +------------------------------------------------------------------- Old: ---- 0001-Don-t-crash-if-initializeVideo-fails.patch ffmpegthumbs-18.08.2.tar.xz New: ---- ffmpegthumbs-18.08.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpegthumbs.spec ++++++ --- /var/tmp/diff_new_pack.jXC1IF/_old 2018-11-13 17:09:30.354905295 +0100 +++ /var/tmp/diff_new_pack.jXC1IF/_new 2018-11-13 17:09:30.354905295 +0100 @@ -17,7 +17,7 @@ Name: ffmpegthumbs -Version: 18.08.2 +Version: 18.08.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -27,8 +27,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch1: 0001-Don-t-crash-if-initializeVideo-fails.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: ki18n-devel @@ -48,7 +46,6 @@ %prep %setup -q -%autopatch -p1 %build %cmake_kf5 -d build ++++++ ffmpegthumbs-18.08.2.tar.xz -> ffmpegthumbs-18.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.08.2/ffmpegthumbnailer/moviedecoder.cpp new/ffmpegthumbs-18.08.3/ffmpegthumbnailer/moviedecoder.cpp --- old/ffmpegthumbs-18.08.2/ffmpegthumbnailer/moviedecoder.cpp 2018-09-26 10:24:42.000000000 +0200 +++ new/ffmpegthumbs-18.08.3/ffmpegthumbnailer/moviedecoder.cpp 2018-11-03 16:25:34.000000000 +0100 @@ -73,7 +73,10 @@ return; } - initializeVideo(); + if (!initializeVideo()) { + // It already printed a message + return; + } m_pFrame = av_frame_alloc(); if (m_pFrame) { @@ -126,7 +129,7 @@ return codecName; } -void MovieDecoder::initializeVideo() +bool MovieDecoder::initializeVideo() { for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) { if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -138,7 +141,7 @@ if (m_VideoStream == -1) { qDebug() << "Could not find video stream"; - return; + return false; } m_pVideoCodecContext = m_pFormatContext->streams[m_VideoStream]->codec; @@ -148,14 +151,17 @@ // set to NULL, otherwise avcodec_close(m_pVideoCodecContext) crashes m_pVideoCodecContext = NULL; qDebug() << "Video Codec not found"; - return; + return false; } m_pVideoCodecContext->workaround_bugs = 1; if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, 0) < 0) { qDebug() << "Could not open video codec"; + return false; } + + return true; } int MovieDecoder::getWidth() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.08.2/ffmpegthumbnailer/moviedecoder.h new/ffmpegthumbs-18.08.3/ffmpegthumbnailer/moviedecoder.h --- old/ffmpegthumbs-18.08.2/ffmpegthumbnailer/moviedecoder.h 2018-09-26 10:24:42.000000000 +0200 +++ new/ffmpegthumbs-18.08.3/ffmpegthumbnailer/moviedecoder.h 2018-11-03 16:25:34.000000000 +0100 @@ -51,7 +51,7 @@ bool getInitialized(); private: - void initializeVideo(); + bool initializeVideo(); bool decodeVideoPacket(); bool getVideoPacket();
