Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package subtitlecomposer for
openSUSE:Factory checked in at 2023-05-09 13:09:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subtitlecomposer (Old)
and /work/SRC/openSUSE:Factory/.subtitlecomposer.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subtitlecomposer"
Tue May 9 13:09:14 2023 rev:13 rq:1085657 version:0.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/subtitlecomposer/subtitlecomposer.changes
2023-04-18 15:52:46.377378720 +0200
+++
/work/SRC/openSUSE:Factory/.subtitlecomposer.new.1533/subtitlecomposer.changes
2023-05-09 13:09:23.913756902 +0200
@@ -1,0 +2,10 @@
+Tue May 9 08:28:01 UTC 2023 - Christophe Marin <[email protected]>
+
+- Add patch:
+ * 0001-Use-non-deprecated-ffmpeg-api.patch
+- Rename 4f4f560e40ba0b760cf688eb024be3cc734ca347.patch to
+ 0001-Fix-compilation-with-ffmpeg5-63.patch
+- Rename d8f9797d9c0d45fa9f4402f79c539544b74d2cc7.patch to
+ 0001-VideoPlayer-Fix-usage-of-deprecated-removed-AVCodec-.patch
+
+-------------------------------------------------------------------
Old:
----
4f4f560e40ba0b760cf688eb024be3cc734ca347.patch
d8f9797d9c0d45fa9f4402f79c539544b74d2cc7.patch
New:
----
0001-Fix-compilation-with-ffmpeg5-63.patch
0001-Use-non-deprecated-ffmpeg-api.patch
0001-VideoPlayer-Fix-usage-of-deprecated-removed-AVCodec-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subtitlecomposer.spec ++++++
--- /var/tmp/diff_new_pack.ufUZ8T/_old 2023-05-09 13:09:24.465760187 +0200
+++ /var/tmp/diff_new_pack.ufUZ8T/_new 2023-05-09 13:09:24.469760211 +0200
@@ -30,10 +30,12 @@
Patch0: subtitlecomposer-ARM_GLES.patch
# PATCH-FIX-UPSTREAM subtitlecomposer-fix_empty_lines_crash.patch
Patch1: subtitlecomposer-fix_empty_lines_crash.patch
-# PATCH-FIX-UPSTREAM 4f4f560e40ba0b760cf688eb024be3cc734ca347.patch - Fix
build with ffmpeg 5
-Patch2:
https://invent.kde.org/multimedia/subtitlecomposer/-/commit/4f4f560e40ba0b760cf688eb024be3cc734ca347.patch
-# PATCH-FIX-UPSTREAM d8f9797d9c0d45fa9f4402f79c539544b74d2cc7.patch - Fix
video player
-Patch3:
https://invent.kde.org/multimedia/subtitlecomposer/-/commit/d8f9797d9c0d45fa9f4402f79c539544b74d2cc7.patch
+# PATCH-FIX-UPSTREAM Fix build with ffmpeg 5
+Patch2: 0001-Fix-compilation-with-ffmpeg5-63.patch
+# PATCH-FIX-UPSTREAM Fix video player
+Patch3: 0001-VideoPlayer-Fix-usage-of-deprecated-removed-AVCodec-.patch
+# PATCH-FIX-UPSTREAM
+Patch4: 0001-Use-non-deprecated-ffmpeg-api.patch
BuildRequires: cmake >= 3.10
BuildRequires: extra-cmake-modules
BuildRequires: libQt5Widgets-private-headers-devel
++++++ 0001-Fix-compilation-with-ffmpeg5-63.patch ++++++
>From 78a2ef9d823cd61b60957948490373dabfed4f1f Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <[email protected]>
Date: Tue, 25 Jan 2022 14:01:56 +0100
Subject: [PATCH] Fix compilation with ffmpeg5 #63
---
src/streamprocessor/streamprocessor.cpp | 2 +-
src/videoplayer/backend/decoder.h | 1 +
src/videoplayer/backend/framequeue.h | 1 +
src/videoplayer/backend/streamdemuxer.cpp | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/streamprocessor/streamprocessor.cpp
b/src/streamprocessor/streamprocessor.cpp
index b86795e..8faf8a2 100644
--- a/src/streamprocessor/streamprocessor.cpp
+++ b/src/streamprocessor/streamprocessor.cpp
@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int
streamIndex, bool imageSub)
int ret;
char errorText[1024];
- AVCodec *dec =
avcodec_find_decoder(m_avStream->codecpar->codec_id);
+ const AVCodec *dec =
avcodec_find_decoder(m_avStream->codecpar->codec_id);
if(!dec) {
qWarning() << "Failed to find decoder for stream" << i;
return false;
diff --git a/src/videoplayer/backend/decoder.h
b/src/videoplayer/backend/decoder.h
index 4ab95b2..fb6840d 100644
--- a/src/videoplayer/backend/decoder.h
+++ b/src/videoplayer/backend/decoder.h
@@ -11,6 +11,7 @@
#include <QThread>
extern "C" {
+#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
}
diff --git a/src/videoplayer/backend/framequeue.h
b/src/videoplayer/backend/framequeue.h
index dc9b2fa..ece1166 100644
--- a/src/videoplayer/backend/framequeue.h
+++ b/src/videoplayer/backend/framequeue.h
@@ -9,6 +9,7 @@
#define FRAMEQUEUE_H
extern "C" {
+#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
}
diff --git a/src/videoplayer/backend/streamdemuxer.cpp
b/src/videoplayer/backend/streamdemuxer.cpp
index 1e339b3..e8320ea 100644
--- a/src/videoplayer/backend/streamdemuxer.cpp
+++ b/src/videoplayer/backend/streamdemuxer.cpp
@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex)
{
AVFormatContext *ic = m_vs->fmtContext;
AVCodecContext *avCtx;
- AVCodec *codec;
+ const AVCodec *codec;
AVDictionary *opts = nullptr;
AVDictionaryEntry *t = nullptr;
int sampleRate, nbChannels;
--
2.40.1
++++++ 0001-Use-non-deprecated-ffmpeg-api.patch ++++++
>From 12f4d7f49d0b1a7fc02b0836521a285e7b6bac9d Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <[email protected]>
Date: Sat, 4 Mar 2023 10:58:04 +0100
Subject: [PATCH] Use non deprecated ffmpeg api
---
src/videoplayer/backend/streamdemuxer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/videoplayer/backend/streamdemuxer.cpp
b/src/videoplayer/backend/streamdemuxer.cpp
index e3bd808..39222d8 100644
--- a/src/videoplayer/backend/streamdemuxer.cpp
+++ b/src/videoplayer/backend/streamdemuxer.cpp
@@ -504,7 +504,7 @@ StreamDemuxer::run()
{ // find_stream_info
const int origNbStreams = ic->nb_streams;
- AVDictionary **opts = (AVDictionary
**)av_mallocz_array(origNbStreams, sizeof(*opts));
+ AVDictionary **opts = (AVDictionary **)av_calloc(origNbStreams,
sizeof(*opts));
if(!opts) {
av_log(nullptr, AV_LOG_ERROR, "Could not alloc memory
for stream options.\n");
goto cleanup;
--
2.40.1
++++++ 0001-VideoPlayer-Fix-usage-of-deprecated-removed-AVCodec-.patch ++++++
>From 47376250728b8334ef2476c6f2a5fc956ee70e68 Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <[email protected]>
Date: Fri, 1 Apr 2022 08:35:17 +0200
Subject: [PATCH] VideoPlayer: Fix usage of deprecated/removed AVCodec option
#68
AVCodecContext.refcounted_frames was useful for deprecated API only
(avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs
(avcodec_send_packet/avcodec_receive_frame) always work with reference
counted frames
https://github.com/FFmpeg/FFmpeg/commit/b1cf151c4dfdbd049cd41863b4e0cde927585e17
---
src/videoplayer/backend/streamdemuxer.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/videoplayer/backend/streamdemuxer.cpp
b/src/videoplayer/backend/streamdemuxer.cpp
index e8320ea..7173306 100644
--- a/src/videoplayer/backend/streamdemuxer.cpp
+++ b/src/videoplayer/backend/streamdemuxer.cpp
@@ -286,8 +286,6 @@ StreamDemuxer::componentOpen(int streamIndex)
av_dict_set(&opts, "threads", "auto", 0);
if(stream_lowres)
av_dict_set_int(&opts, "lowres", stream_lowres, 0);
- if(avCtx->codec_type == AVMEDIA_TYPE_VIDEO || avCtx->codec_type ==
AVMEDIA_TYPE_AUDIO)
- av_dict_set(&opts, "refcounted_frames", "1", 0);
if((ret = avcodec_open2(avCtx, codec, &opts)) < 0) {
goto fail;
}
--
2.40.1
