Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dvbcut for openSUSE:Factory checked in at 2022-08-06 22:08:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dvbcut (Old) and /work/SRC/openSUSE:Factory/.dvbcut.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvbcut" Sat Aug 6 22:08:13 2022 rev:3 rq:993432 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/dvbcut/dvbcut.changes 2019-04-23 14:36:03.633473079 +0200 +++ /work/SRC/openSUSE:Factory/.dvbcut.new.1521/dvbcut.changes 2022-08-06 22:08:25.550703250 +0200 @@ -1,0 +2,7 @@ +Fri Aug 5 19:43:55 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 0.7.4: + + Updated autotools files. + + Build with ffmpeg 5. + +------------------------------------------------------------------- Old: ---- dvbcut-0.7.3.tar.gz New: ---- dvbcut-0.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvbcut.spec ++++++ --- /var/tmp/diff_new_pack.59AGWd/_old 2022-08-06 22:08:26.094704831 +0200 +++ /var/tmp/diff_new_pack.59AGWd/_new 2022-08-06 22:08:26.098704843 +0200 @@ -1,7 +1,7 @@ # # spec file for package dvbcut # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dvbcut -Version: 0.7.3 +Version: 0.7.4 Release: 0 Summary: Qt application for cutting parts out of DVB streams License: GPL-2.0-or-later AND LGPL-2.1-only ++++++ dvbcut-0.7.3.tar.gz -> dvbcut-0.7.4.tar.gz ++++++ ++++ 4048 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/DISTFILES new/dvbcut-deb-0.7.4/DISTFILES --- old/dvbcut-deb-0.7.3/DISTFILES 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/DISTFILES 2022-06-26 18:51:34.000000000 +0200 @@ -39,7 +39,6 @@ icons/play.svgz icons/stop.png icons/stop.svgz -import/byteswap.h import/stdlib.cpp import/stdlib.h import/sys/mman.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/README new/dvbcut-deb-0.7.4/README --- old/dvbcut-deb-0.7.3/README 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/README 2022-06-26 18:51:34.000000000 +0200 @@ -1,6 +1,6 @@ -DVBCUT README -- last edited 2018-08-20 +DVBCUT README -- last edited 2022-06-26 -I am pleased to announce version 0.7.3 of dvbcut. +I am pleased to announce version 0.7.4 of dvbcut. See the file "COPYING" for license issues. See the file "INSTALL" file for installation instructions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/VERSION new/dvbcut-deb-0.7.4/VERSION --- old/dvbcut-deb-0.7.3/VERSION 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/VERSION 2022-06-26 18:51:34.000000000 +0200 @@ -1 +1 @@ -0.7.3 +0.7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/configure.ac new/dvbcut-deb-0.7.4/configure.ac --- old/dvbcut-deb-0.7.3/configure.ac 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/configure.ac 2022-06-26 18:51:34.000000000 +0200 @@ -4,11 +4,12 @@ #@(#) $Id$ -AC_INIT(src/dvbcut.cpp) +AC_INIT +AC_CONFIG_SRCDIR([src/dvbcut.cpp]) -AC_PREREQ(2.13) +AC_PREREQ([2.71]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_BUILD CONFIGURE_ARGS="$ac_configure_args" AC_SUBST(CONFIGURE_ARGS) @@ -21,16 +22,9 @@ AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(PKG_CONFIG, pkg-config, :) -AC_CYGWIN -AC_MINGW32 AC_EXEEXT AC_OBJEXT -if test "$MINGW32" = yes; then - CPPFLAGS="$CPPFLAGS -I/usr/local/include" - LDFLAGS="$LDFLAGS -L/usr/local/lib" -fi - dnl check for library dir mr_libdirname=lib set -- `LC_ALL=C $CC -print-search-dirs | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,' | sed -e 's,:, ,'g` @@ -60,29 +54,17 @@ [AC_MSG_ERROR([Did not find required a52 library])], [-lm]) -mr_other_libs= -if test "$MINGW32" = yes; then - mr_other_libs=-lwinmm -fi - AC_CHECK_LIB(ao, ao_initialize, [AC_DEFINE(HAVE_LIB_AO, 1, [Define this if you have libao.]) - LIBS="$LIBS -lao $mr_other_libs"], - [AC_MSG_WARN([Did not find libao - dvbcut will not play audio])], - [$mr_other_libs]) + LIBS="$LIBS -lao"], + [AC_MSG_WARN([Did not find libao - dvbcut will not play audio])]) STDLIB= AC_SUBST(STDLIB) -if test "$MINGW32" = yes; then - CPPFLAGS="-I\$(top_srcdir)/import $CPPFLAGS" - STDLIB='$(top_srcdir)/import/stdlib.cpp' -fi - dnl AC_CHECK_LIB(m, sqrt, [LIBS="$LIBS -lm"]) dnl Checks for header files. -AC_HEADER_STDC AC_CHECK_HEADERS(ao/ao.h mad.h stdint.h a52dec/a52.h) dnl Checks for typedefs, structures, and compiler characteristics. @@ -94,21 +76,18 @@ AC_FUNC_MMAP dnl external stuff -AC_CHECK_LIB(Qt5Core, main, - [HAVE_QT5="yes"], - [AC_MSG_ERROR([Qt5Core library not found])]) - -AC_CHECK_LIB(Qt5Gui, main, - [HAVE_QT5="yes"], - [AC_MSG_ERROR([Qt5Gui library not found])]) - -AC_CHECK_LIB(Qt5Xml, main, - [HAVE_QT5="yes"], - [AC_MSG_ERROR([Qt5Xml library not found])]) - -AC_CHECK_LIB(Qt5Widgets, main, - [HAVE_QT5="yes"], - [AC_MSG_ERROR([Qt5Widgets library not found])]) +PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.3 Qt5Gui >= 5.3 Qt5Xml >= 5.3 Qt5Widgets >= 5.3]) +AC_SUBST([QT5_CFLAGS]) +AC_SUBST([QT5_LIBS]) + +#error "You must build your code with position independent code if Qt was built with -reduce-relocations. " \ +# "Compile your code with -fPIC (-fPIE is not enough)." +# +# https://bugreports.qt.io/browse/QTBUG-50156 +# With Qt5 pkg-config reports no '-fPIC', but header file complains that it is needed. +# +CPPFLAGS="$CPPFLAGS -fPIC $QT5_CFLAGS" +LIBS="$LIBS $QT5_LIBS" AC_CHECK_PROGS(MOC, [moc-qt5 moc]) AC_CHECK_PROGS(UIC, [uic-qt5 uic]) @@ -118,29 +97,12 @@ AC_MSG_ERROR([Qt utility programs moc, uic, rcc and lrelease are required.]) fi -if test "x$HAVE_QT5" = "xyes"; then - QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Xml Qt5Widgets` - - #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " \ - # "Compile your code with -fPIC (-fPIE is not enough)." - # - # https://bugreports.qt.io/browse/QTBUG-50156 - # With Qt5 pkg-config reports no '-fPIC', but header file complains that it is needed. - # - QT_CXXFLAGS="-fPIC $QT_CXXFLAGS" - - QT_LIBS=`$PKG_CONFIG --libs Qt5Core Qt5Gui Qt5Xml Qt5Widgets` - CPPFLAGS="$CPPFLAGS $QT_CXXFLAGS" - LIBS="$LIBS $QT_LIBS" -else - AC_MSG_ERROR([cannot find Qt5 library >= 5.3]) -fi - AC_DEFINE(__STDC_LIMIT_MACROS, 1, [Required for C++]) AC_DEFINE(__STDC_CONSTANT_MACROS, 1, [Required for C++]) AC_DEFINE(_FILE_OFFSET_BITS, 64, [We are always using large files]) dnl AC_DEFINE(_LARGEFILE_SOURCE) -AC_OUTPUT([Makefile src/Makefile dvbcut.desktop]) +AC_CONFIG_FILES([Makefile src/Makefile dvbcut.desktop]) +AC_OUTPUT # vi: set ts=8 sw=2 : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/contrib/arch/PKGBUILD new/dvbcut-deb-0.7.4/contrib/arch/PKGBUILD --- old/dvbcut-deb-0.7.3/contrib/arch/PKGBUILD 1970-01-01 01:00:00.000000000 +0100 +++ new/dvbcut-deb-0.7.4/contrib/arch/PKGBUILD 2022-06-26 18:51:34.000000000 +0200 @@ -0,0 +1,43 @@ +# Contributor: sp42b <sp42b|a_t|gmx.net> +# Contributor: AndyRTR <andreas.ra...@freenet.de> +# Contributor: Bernhard ??belacker <bernha...@mailbox.org> + +pkgname=dvbcut +pkgver=0.7.4 +pkgrel=1 +pkgdesc='Qt5 application for cutting parts out of DVB streams' +arch=('i686' 'x86_64') +url='https://github.com/bernhardu/dvbcut-deb' +license=('GPL') +depends=('desktop-file-utils' 'qt5-base' 'libao' 'libmad' 'a52dec') +optdepends=('mplayer: for video playback inside of DVBCUT') +install="$pkgname.install" +source=("https://github.com/bernhardu/dvbcut-deb/archive/v0.7.4.tar.gz";) +# update when available. sha256sums=('c0397919e89bd3a77f488b8c25d3bad9a11f14cd30d16097c3bf666bc3f56d7b') +#options=(debug !strip) + +build() { + cd "$srcdir/dvbcut-deb-$pkgver" + + autoconf + ./configure --prefix=/usr + make -j1 +} + +package() { + cd "$srcdir/dvbcut-deb-$pkgver" + + install -Dm755 bin/dvbcut "$pkgdir/usr/bin/dvbcut" + install -Dm644 dvbcut.1 "$pkgdir/usr/share/man/man1/dvbcut.1" + install -Dm644 dvbcut.desktop "$pkgdir/usr/share/applications/dvbcut.desktop" + install -Dm644 dvbcut.svg "$pkgdir/usr/share/dvbcut/icons/dvbcut.svg" + install -Dm644 dvbcut.xml "$pkgdir/usr/share/mime/packages/dvbcut.xml" + install -Dm644 src/dvbcut_en.html "$pkgdir/usr/share/dvbcut/dvbcut_en.html" + install -Dm644 src/dvbcut.qm "$pkgdir/usr/share/dvbcut/dvbcut.qm" + install -Dm644 src/dvbcut_cs.html "$pkgdir/usr/share/dvbcut/dvbcut_cs.html" + install -Dm644 src/dvbcut_cs.qm "$pkgdir/usr/share/dvbcut/dvbcut_cs.qm" + install -Dm644 src/dvbcut_de.html "$pkgdir/usr/share/dvbcut/dvbcut_de.html" + install -Dm644 src/dvbcut_de.qm "$pkgdir/usr/share/dvbcut/dvbcut_de.qm" +} + +# vim:set ts=2 sw=2 et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/contrib/arch/dvbcut.install new/dvbcut-deb-0.7.4/contrib/arch/dvbcut.install --- old/dvbcut-deb-0.7.3/contrib/arch/dvbcut.install 1970-01-01 01:00:00.000000000 +0100 +++ new/dvbcut-deb-0.7.4/contrib/arch/dvbcut.install 2022-06-26 18:51:34.000000000 +0200 @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/contrib/arch/readme.txt new/dvbcut-deb-0.7.4/contrib/arch/readme.txt --- old/dvbcut-deb-0.7.3/contrib/arch/readme.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/dvbcut-deb-0.7.4/contrib/arch/readme.txt 2022-06-26 18:51:34.000000000 +0200 @@ -0,0 +1,40 @@ + +# minimal arch qemu VM 2021-02-19 + + +### Install graphical environment +# pacman -Syy # similar: apt update +# pacman -Syu # similar: apt update && apt dist-upgrade +# pacman -S xorg-server xorg-xinit xf86-video-vesa xfce4 lightdm lightdm-gtk-greeter +# systemctl enable lightdm + + +### Install dependencies +# pacman -S git fakeroot base-devel qt5 libao libmad a52dec wget desktop-file-utils gdb + + +mkdir dvbcut +cd dvbcut +wget https://raw.githubusercontent.com/bernhardu/dvbcut-deb/master/contrib/arch/PKGBUILD +wget https://raw.githubusercontent.com/bernhardu/dvbcut-deb/master/contrib/arch/dvbcut.install + # Taken and updated from https://aur.archlinux.org/dvbcut.git + +makepkg + + +### Install package: +# pacman -U /home/user/path/to/dvbcut-0.7.4-1-x86_64.pkg.tar.zst + + +### Debug +# uncomment "options=(debug !strip)" in PKGBUILD and rebuild (with a clean directory), reinstall + + # Run from the build directory, as somehow the binary in the package still gets stripped. +$ gdb -q --args ./src/dvbcut-deb-0.7.4/src/dvbcut +(gdb) run + + # When gdb stopps because of the crash +(gdb) bt full + + + # Maybe some hints in debugging: https://wiki.archlinux.org/index.php/Debug_-_Getting_Traces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/debian/changelog new/dvbcut-deb-0.7.4/debian/changelog --- old/dvbcut-deb-0.7.3/debian/changelog 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/debian/changelog 2022-06-26 18:51:34.000000000 +0200 @@ -1,3 +1,27 @@ +dvbcut (0.7.3-2) UNRELEASED; urgency=medium + + * Wrap long lines in changelog entries: 0.7.3-1. + * Bump debhelper from old 11 to 12. + * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + -- Debian Janitor <jani...@jelmer.uk> Mon, 24 Feb 2020 08:38:28 +0000 + +dvbcut (0.7.3-1) unstable; urgency=low + + * New upstream release 0.7.3. + - Be able to build with Qt5 utils with -qt5 postfix. (Thanks to Luigi + Baldoni) + - Fix issue with reencoded frames appear with 50 FPS. + + * Switch copyright-format URL from http to https. + * Bump standards version from 3.9.8 to 4.1.4. + * Bump debhelper version from 10 to 11. + * Remove trailing whitespace from debian files. + + -- Bernhard ??belacker <bernha...@mailbox.org> Mon, 20 Aug 2018 01:17:30 +0200 + dvbcut (0.7.2-1) unstable; urgency=low * New upstream release 0.7.2. @@ -166,7 +190,7 @@ + port-to-qt4.patch: - Drop cmake files from qt4 patch - Update configure and src/Makefile.in for qt4 - + This allows the automatic installation of desktop file and icon + + This allows the automatic installation of desktop file and icon (Closes: #660009) * Refresh fix-ftbfs-libav0.7 patch to use -pab as quilt arg. This makes futur refreshes lighter. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/debian/compat new/dvbcut-deb-0.7.4/debian/compat --- old/dvbcut-deb-0.7.3/debian/compat 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/debian/control new/dvbcut-deb-0.7.4/debian/control --- old/dvbcut-deb-0.7.3/debian/control 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/debian/control 2022-06-26 18:51:34.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Bernhard ??belacker <bernha...@mailbox.org> Build-Depends: - debhelper (>= 10), + debhelper-compat (= 12), liba52-0.7.4-dev, libao-dev, libavcodec-dev (>> 6:11~), @@ -19,7 +19,7 @@ Vcs-Git: https://github.com/bernhardu/dvbcut-deb.git Vcs-Browser: https://github.com/bernhardu/dvbcut-deb Homepage: https://github.com/bernhardu/dvbcut-deb -Standards-Version: 3.9.8 +Standards-Version: 4.1.4 Package: dvbcut Architecture: any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/debian/copyright new/dvbcut-deb-0.7.4/debian/copyright --- old/dvbcut-deb-0.7.3/debian/copyright 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/debian/copyright 2022-06-26 18:51:34.000000000 +0200 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dvbcut Source: https://github.com/bernhardu/dvbcut-deb Comment: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/debian/rules new/dvbcut-deb-0.7.4/debian/rules --- old/dvbcut-deb-0.7.3/debian/rules 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/debian/rules 2022-06-26 18:51:34.000000000 +0200 @@ -14,4 +14,3 @@ dh $@ override_dh_auto_install: - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/debian/upstream/metadata new/dvbcut-deb-0.7.4/debian/upstream/metadata --- old/dvbcut-deb-0.7.3/debian/upstream/metadata 1970-01-01 01:00:00.000000000 +0100 +++ new/dvbcut-deb-0.7.4/debian/upstream/metadata 2022-06-26 18:51:34.000000000 +0200 @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/bernhardu/dvbcut-deb/issues +Bug-Submit: https://github.com/bernhardu/dvbcut-deb/issues/new +Repository: https://github.com/bernhardu/dvbcut-deb.git +Repository-Browse: https://github.com/bernhardu/dvbcut-deb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/import/byteswap.h new/dvbcut-deb-0.7.4/import/byteswap.h --- old/dvbcut-deb-0.7.3/import/byteswap.h 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/import/byteswap.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -/* byteswap.h - -Copyright 2005 Red Hat, Inc. - -This file is part of Cygwin. - -This software is a copyrighted work licensed under the terms of the -Cygwin license. Please consult the file "CYGWIN_LICENSE" for -details. */ - -#ifndef _BYTESWAP_H -#define _BYTESWAP_H - -#ifdef __cplusplus -extern "C" { -#endif -#define __bswap_constant_16 __bswap_16 -#define __bswap_constant_32 __bswap_32 -#define __bswap_constant_64 __bswap_64 -#define __bswap_16(x) \ - ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) - -#define __bswap_32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) - - -#define __bswap_64(x) \ - ((((x) & 0xff00000000000000ull) >> 56) \ - | (((x) & 0x00ff000000000000ull) >> 40) \ - | (((x) & 0x0000ff0000000000ull) >> 24) \ - | (((x) & 0x000000ff00000000ull) >> 8) \ - | (((x) & 0x00000000ff000000ull) << 8) \ - | (((x) & 0x0000000000ff0000ull) << 24) \ - | (((x) & 0x000000000000ff00ull) << 40) \ - | (((x) & 0x00000000000000ffull) << 56)) - -#ifdef __cplusplus -} -#endif -#endif /* _BYTESWAP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/avframe.cpp new/dvbcut-deb-0.7.4/src/avframe.cpp --- old/dvbcut-deb-0.7.3/src/avframe.cpp 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/avframe.cpp 2022-06-26 18:51:34.000000000 +0200 @@ -78,7 +78,7 @@ dw=w*ctx->sample_aspect_ratio.num/ctx->sample_aspect_ratio.den; #ifdef HAVE_LIB_SWSCALE img_convert_ctx=sws_getContext(w, h, pix_fmt, - w, h, AV_PIX_FMT_BGR24, SWS_BICUBIC, + w, h, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); #endif } @@ -105,38 +105,31 @@ return QImage(); #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 0, 0) - uint8_t *rgbbuffer = (uint8_t*)malloc(av_image_get_buffer_size(AV_PIX_FMT_RGB24, w, h, 1) + 64); + uint8_t *rgbbuffer = (uint8_t*)malloc(av_image_get_buffer_size(AV_PIX_FMT_RGB24, w, h, 1)); #else - uint8_t *rgbbuffer=(uint8_t*)malloc(avpicture_get_size(AV_PIX_FMT_RGB24, w, h)+64); + uint8_t *rgbbuffer=(uint8_t*)malloc(avpicture_get_size(AV_PIX_FMT_RGB24, w, h)); #endif - int headerlen=sprintf((char *) rgbbuffer, "P6\n%d %d\n255\n", w, h); - AVFrame *avframergb=av_frame_alloc(); #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 0, 0) av_image_fill_arrays(avframergb->data, avframergb->linesize, - rgbbuffer + headerlen, + rgbbuffer, AV_PIX_FMT_RGB24, w, h, 1); #else avpicture_fill((AVPicture*)avframergb, - rgbbuffer+headerlen, + rgbbuffer, AV_PIX_FMT_RGB24,w,h); #endif #ifdef HAVE_LIB_SWSCALE - sws_scale(img_convert_ctx, f->data, f->linesize, 0, h, + sws_scale(img_convert_ctx, f->data, f->linesize, 0, h, avframergb->data, avframergb->linesize); #else img_convert((AVPicture *)avframergb, AV_PIX_FMT_RGB24, (AVPicture*)f, pix_fmt, w, h); #endif - QImage im; - im.loadFromData(rgbbuffer, headerlen+w*h*3, "PPM"); - -#ifdef HAVE_LIB_SWSCALE - im = im.rgbSwapped(); -#endif + QImage im(rgbbuffer, w, h, 3*w, QImage::Format_RGB888, ::free, rgbbuffer); if ((scaled && w!=dw)||(viewscalefactor!=1.0)) { #ifdef SMOOTHSCALE @@ -146,7 +139,6 @@ #endif } - free(rgbbuffer); av_frame_free(&avframergb); return (im); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/defines.h new/dvbcut-deb-0.7.4/src/defines.h --- old/dvbcut-deb-0.7.3/src/defines.h 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/defines.h 2022-06-26 18:51:34.000000000 +0200 @@ -46,9 +46,9 @@ #define mbo32(x) \ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) -#define htom32(x) (__bswap_32(x)) +#define htom32(x) mbo32(x) #define mbo16(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) -#define htom16(x) (__bswap_16(x)) +#define htom16(x) mbo16(x) #else #define mbo32(x) (x) #define htom32(x) (x) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/dvbcut.cpp new/dvbcut-deb-0.7.4/src/dvbcut.cpp --- old/dvbcut-deb-0.7.3/src/dvbcut.cpp 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/dvbcut.cpp 2022-06-26 18:51:34.000000000 +0200 @@ -992,7 +992,7 @@ //fprintf(stderr,"%d, DIST=%f\n",pic,dist); if(dist>settings().chapter_threshold) { inpic=pic; - statusBar()->showMessage(QString().sprintf("%d. Scene change @ %d, DIST=%f\n",chapters+1,inpic,dist)); + statusBar()->showMessage(QString().asprintf("%d. Scene change @ %d, DIST=%f\n",chapters+1,inpic,dist)); break; } } @@ -1326,12 +1326,12 @@ #ifdef __WIN32__ arguments << "-vo" << "directx:noaccel"; #endif - arguments << "-wid" << QString().sprintf("0x%x",int(ui->imagedisplay->winId())); + arguments << "-wid" << QString().asprintf("0x%x",int(ui->imagedisplay->winId())); arguments << "-sb" << QString::number(offset - partoffset); - arguments << "-geometry" << QString().sprintf("%dx%d+0+0",int(ui->imagedisplay->width()),int(ui->imagedisplay->height())); + arguments << "-geometry" << QString().asprintf("%dx%d+0+0",int(ui->imagedisplay->width()),int(ui->imagedisplay->height())); if (currentaudiotrack>=0 && currentaudiotrack<mpg->getaudiostreams()) { - arguments << "-aid" << QString().sprintf("0x%x", int(mpg->mplayeraudioid(currentaudiotrack))); + arguments << "-aid" << QString().asprintf("0x%x", int(mpg->mplayeraudioid(currentaudiotrack))); } // for now, pass all filenames from the current one up to the last one @@ -2155,7 +2155,7 @@ idxfilen=idxfilename; prjfilen=prjfilename; expfilen=expfilename; - picfilen=QString::null; + picfilen=QString(); if (prjfilen.empty()) addtorecentfiles(mpgfilen,idxfilen); else { @@ -2331,7 +2331,7 @@ if (e->type() == QEvent::Wheel && watched != ui->jogslider) { QWheelEvent *we = (QWheelEvent*)e; // Note: delta is a multiple of 120 (see Qt documentation) - delta = we->delta(); + delta = we->angleDelta().y(); mods = we->modifiers(); if(mods & Qt::AltModifier) { incr = WHEEL_INCR_ALT; @@ -2451,7 +2451,7 @@ inline static QString timestr(pts_t pts) { - return QString().sprintf("%02d:%02d:%02d.%03d", + return QString().asprintf("%02d:%02d:%02d.%03d", int(pts/(3600*90000)), int(pts/(60*90000))%60, int(pts/90000)%60, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/eventlistitem.cpp new/dvbcut-deb-0.7.4/src/eventlistitem.cpp --- old/dvbcut-deb-0.7.3/src/eventlistitem.cpp 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/eventlistitem.cpp 2022-06-26 18:51:34.000000000 +0200 @@ -68,7 +68,7 @@ //: Text shown on bookmark markers in the main window marker list .arg(QCoreApplication::translate("eventlist", "BOOKMARK")); - return label + QString().sprintf("<br>%02d:%02d:%02d.%03d<br>%d (%c)", + return label + QString().asprintf("<br>%02d:%02d:%02d.%03d<br>%d (%c)", int(pts/(3600*90000)), int(pts/(60*90000))%60, int(pts/90000)%60, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/exportdialogbase.ui new/dvbcut-deb-0.7.4/src/exportdialogbase.ui --- old/dvbcut-deb-0.7.3/src/exportdialogbase.ui 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/exportdialogbase.ui 2022-06-26 18:51:34.000000000 +0200 @@ -138,7 +138,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11"/> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <resources/> <connections> <connection> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/index.h new/dvbcut-deb-0.7.4/src/index.h --- old/dvbcut-deb-0.7.3/src/index.h 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/index.h 2022-06-26 18:51:34.000000000 +0200 @@ -22,7 +22,6 @@ #define _DVBCUT_INDEX_H #include <stdint.h> -#include <byteswap.h> #include <set> #include <vector> #include "types.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/lavfmuxer.cpp new/dvbcut-deb-0.7.4/src/lavfmuxer.cpp --- old/dvbcut-deb-0.7.3/src/lavfmuxer.cpp 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/lavfmuxer.cpp 2022-06-26 18:51:34.000000000 +0200 @@ -35,50 +35,43 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg, const char *filename) : muxer(), avfc(0), fileopened(false) { - fmt = av_guess_format(format, NULL, NULL); - if (!fmt) { + auto fmt_ = av_guess_format(format, NULL, NULL); + if (!fmt_) { return; } + fmt = fmt_; - avfc=avformat_alloc_context(); - if (!avfc) + if (avformat_alloc_output_context2(&avfc, fmt_, NULL, av_strdup(filename ? filename : "")) < 0) return; av_opt_set_int(avfc, "preload", (int)(.5 * AV_TIME_BASE), AV_OPT_SEARCH_CHILDREN); av_opt_set_int(avfc, "muxrate", 10080000, AV_OPT_SEARCH_CHILDREN); avfc->max_delay= (int)(.7*AV_TIME_BASE); - avfc->oformat=fmt; - strncpy(avfc->filename, filename, sizeof(avfc->filename)); - int id=0; st[VIDEOSTREAM].stream_index=id; - AVStream *s=st[VIDEOSTREAM].avstr=avformat_new_stream(avfc, NULL); - s->id = id++; + strpres[VIDEOSTREAM]=true; - av_free(s->codec); mpg.setvideoencodingparameters(); - s->codec=mpg.getavcc(VIDEOSTREAM); - s->codec->rc_buffer_size = 224*1024*8; - s->sample_aspect_ratio = s->codec->sample_aspect_ratio; - s->time_base = s->codec->time_base; + AVCodecContext* codec = mpg.getavcc(VIDEOSTREAM); + codec->rc_buffer_size = 224*1024*8; + AVStream *s = st[VIDEOSTREAM].avstr = avformat_new_stream(avfc, codec->codec); + s->id = id++; + s->sample_aspect_ratio = codec->sample_aspect_ratio; + s->time_base = codec->time_base; for (int i=0;i<mpg.getaudiostreams();++i) if (audiostreammask & (1u<<i)) { int astr=audiostream(i); st[astr].stream_index=id; - s=st[astr].avstr=avformat_new_stream(avfc, NULL); + codec = avcodec_alloc_context3(NULL); + codec->codec_type = AVMEDIA_TYPE_AUDIO; + codec->codec_id = (mpg.getstreamtype(astr)==streamtype::ac3audio) ? AV_CODEC_ID_AC3 : AV_CODEC_ID_MP2; + codec->rc_buffer_size = 224*1024*8; + s = st[astr].avstr = avformat_new_stream(avfc, codec->codec); s->id = id++; strpres[astr]=true; - if (s->codec) - av_free(s->codec); - s->codec = avcodec_alloc_context3(NULL); - avcodec_get_context_defaults3(s->codec, NULL); - s->codec->codec_type=AVMEDIA_TYPE_AUDIO; - s->codec->codec_id = (mpg.getstreamtype(astr)==streamtype::ac3audio) ? - AV_CODEC_ID_AC3 : AV_CODEC_ID_MP2; - s->codec->rc_buffer_size = 224*1024*8; // Must read some packets to get codec parameters streamhandle sh(mpg.getinitialoffset()); @@ -89,25 +82,25 @@ break; if (sd->getitemlistsize() > 1) { - if (!avcodec_open2(s->codec, - avcodec_find_decoder(s->codec->codec_id), NULL)) { + if (!avcodec_open2(codec, + avcodec_find_decoder(codec->codec_id), NULL)) { AVFrame *frame = av_frame_alloc(); - AVPacket pkt; - int got_output; + AVPacket* pkt = av_packet_alloc(); - av_init_packet( &pkt ); - pkt.data = (uint8_t*) sd->getdata(); - pkt.size = sd->inbytes(); + pkt->data = (uint8_t*)sd->getdata(); + pkt->size = sd->inbytes(); - avcodec_decode_audio4(s->codec, frame, &got_output, &pkt); + avcodec_send_packet(codec, pkt); + avcodec_receive_frame(codec, frame); + av_packet_free(&pkt); av_frame_free(&frame); - avcodec_close(s->codec); + avcodec_close(codec); } break; } } - s->time_base = s->codec->time_base; + s->time_base = codec->time_base; } if (!(fmt->flags & AVFMT_NOFILE)&&(avio_open(&avfc->pb, filename, AVIO_FLAG_WRITE) < 0)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/lavfmuxer.h new/dvbcut-deb-0.7.4/src/lavfmuxer.h --- old/dvbcut-deb-0.7.3/src/lavfmuxer.h 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/lavfmuxer.h 2022-06-26 18:51:34.000000000 +0200 @@ -48,7 +48,7 @@ } }; - AVOutputFormat *fmt; + const AVOutputFormat *fmt; AVFormatContext *avfc; stream st[MAXAVSTREAMS]; @@ -65,18 +65,18 @@ if (len<=0) return 0; - AVPacket avp; - av_init_packet(&avp); - avp.data=(uint8_t*) data; - avp.size=len; - avp.pts=pts; - avp.dts=dts; - avp.stream_index=st[str].stream_index; + AVPacket* avp = av_packet_alloc(); + avp->data = (uint8_t*)data; + avp->size = len; + avp->pts = pts; + avp->dts = dts; + avp->stream_index = st[str].stream_index; if (flags & MUXER_FLAG_KEY) - avp.flags |= AV_PKT_FLAG_KEY; + avp->flags |= AV_PKT_FLAG_KEY; - int rv=av_interleaved_write_frame(avfc,&avp); + int rv = av_interleaved_write_frame(avfc, avp); + av_packet_free(&avp); return rv>=0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/main.cpp new/dvbcut-deb-0.7.4/src/main.cpp --- old/dvbcut-deb-0.7.3/src/main.cpp 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/main.cpp 2022-06-26 18:51:34.000000000 +0200 @@ -213,8 +213,6 @@ ao_initialize(); #endif // HAVE_LIB_AO - av_register_all(); - int rv=1; dvbcut *main=new dvbcut; main->batchmode(batchmode); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/mpgfile.cpp new/dvbcut-deb-0.7.4/src/mpgfile.cpp --- old/dvbcut-deb-0.7.3/src/mpgfile.cpp 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/mpgfile.cpp 2022-06-26 18:51:34.000000000 +0200 @@ -157,50 +157,26 @@ if (!firstsequence || idx[streampic].getsequencenumber()>=seqnr) { const uint8_t *data=(const uint8_t*)sd->getdata(); - int frameFinished=0; - int decodebytes=bytes; - while (decodebytes>0) + AVPacket* pkt = av_packet_alloc(); + pkt->data = (uint8_t*) data; + pkt->size = bytes; + avcodec_send_packet(S->avcc, pkt); + while (avcodec_receive_frame(S->avcc, avf) == 0) { - frameFinished=0; - - AVPacket pkt; - av_init_packet( &pkt ); - pkt.data = (uint8_t*) data; - pkt.size = decodebytes; - int bytesDecoded=avcodec_decode_video2( S->avcc, avf, - &frameFinished, &pkt ); - - if (bytesDecoded<0) - { - fprintf(stderr,"libavcodec error while decoding frame #%d\n",pic); - avcodec_close(S->avcc); - return; - } - - data+=bytesDecoded; - decodebytes-=bytesDecoded; - - if (frameFinished) - { - //fprintf(stderr, "* decoded frame %5d ilace:%d typ:%d pts=%f\n", pic, avf->interlaced_frame, avf->pict_type, (double)avf->pts/90000.0); - if (last_cpn!=avf->coded_picture_number) - { - last_cpn=avf->coded_picture_number; - if (pic>=start) - framelist.push_back(new avframe(avf,S->avcc)); - ++pic; - if (pic>=stop) - { - frameFinished=0; - decodebytes=0; - break; - } + //fprintf(stderr, "* decoded frame %5d ilace:%d typ:%d pts=%f\n", pic, avf->interlaced_frame, avf->pict_type, (double)avf->pts/90000.0); + if (last_cpn!=avf->coded_picture_number) { + last_cpn=avf->coded_picture_number; + if (pic>=start) { + framelist.push_back(new avframe(avf,S->avcc)); + } + ++pic; + if (pic>=stop) { + break; } - else - frameFinished=0; } } + av_packet_free(&pkt); } sd->discard(bytes); @@ -209,16 +185,11 @@ if (pic < stop) { - int frameFinished=0; - - AVPacket pkt; - av_init_packet( &pkt ); - pkt.data = NULL; - pkt.size = 0; - avcodec_decode_video2( S->avcc, avf, - &frameFinished, &pkt ); - - if (frameFinished) + AVPacket* pkt = av_packet_alloc(); + pkt->data = NULL; + pkt->size = 0; + avcodec_send_packet(S->avcc, pkt); + while (avcodec_receive_frame(S->avcc, avf) == 0) { if (last_cpn!=avf->coded_picture_number) { @@ -227,6 +198,7 @@ framelist.push_back(new avframe(avf,S->avcc)); } } + av_packet_free(&pkt); } time_base_num = S->avcc->time_base.num; @@ -765,13 +737,11 @@ pts_t startpts=idx[idx.indexnr(start)].getpts(); while (outpicture<stop) { - AVPacket pkt; + AVPacket* pkt = av_packet_alloc(); u_int8_t *buf=(u_int8_t*)m2v.writeptr(); - int ret, got_output; - av_init_packet(&pkt); - pkt.data = buf; - pkt.size = m2v.getsize(); + pkt->data = buf; + pkt->size = m2v.getsize(); if (!framelist.empty()) { @@ -781,35 +751,41 @@ f->coded_picture_number=f->display_picture_number=p; f->key_frame=(p==0)?1:0; f->pict_type=(p==0)?AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; - ret = avcodec_encode_video2(avcc, &pkt, f, &got_output); + avcodec_send_frame(avcc, f); delete framelist.front(); framelist.pop_front(); ++p; - if (ret < 0 || !got_output) + if (avcodec_receive_packet(avcc, pkt) != 0) { + av_packet_free(&pkt); continue; + } } else { fprintf(stderr,"trying to call avcodec_encode_video with frame=0\n"); - ret = avcodec_encode_video2(avcc, &pkt, NULL, &got_output); + avcodec_send_frame(avcc, NULL); fprintf(stderr,"...back I am.\n"); - if (ret < 0 || !got_output) + if (avcodec_receive_packet(avcc, pkt) != 0) { + av_packet_free(&pkt); break; + } } pts_t vidpts=idx[idx.indexnr(outpicture)].getpts()-offset; pts_t viddts=mux.getdts(VIDEOSTREAM); mux.setdts(VIDEOSTREAM,vidpts); - fixtimecode(pkt.data, pkt.size, vidpts); - mux.putpacket(VIDEOSTREAM,pkt.data,pkt.size,vidpts,viddts, - (pkt.flags & AV_PKT_FLAG_KEY)?MUXER_FLAG_KEY:0 ); + fixtimecode(pkt->data, pkt->size, vidpts); + mux.putpacket(VIDEOSTREAM, pkt->data, pkt->size, vidpts, viddts, + (pkt->flags & AV_PKT_FLAG_KEY)?MUXER_FLAG_KEY:0 ); ++outpicture; if (log && savepics>0) log->setprogress(++savedpics*1000/savepics); + + av_packet_free(&pkt); } for(std::list<avframe*>::iterator fit=framelist.begin();fit!=framelist.end();++fit) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/mplayererrorbase.ui new/dvbcut-deb-0.7.4/src/mplayererrorbase.ui --- old/dvbcut-deb-0.7.3/src/mplayererrorbase.ui 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/mplayererrorbase.ui 2022-06-26 18:51:34.000000000 +0200 @@ -58,7 +58,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11"/> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <resources/> <connections> <connection> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/progresswindowbase.ui new/dvbcut-deb-0.7.4/src/progresswindowbase.ui --- old/dvbcut-deb-0.7.3/src/progresswindowbase.ui 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/progresswindowbase.ui 2022-06-26 18:51:34.000000000 +0200 @@ -42,7 +42,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11"/> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <resources/> <connections> <connection> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dvbcut-deb-0.7.3/src/stream.h new/dvbcut-deb-0.7.4/src/stream.h --- old/dvbcut-deb-0.7.3/src/stream.h 2018-08-20 01:08:52.000000000 +0200 +++ new/dvbcut-deb-0.7.4/src/stream.h 2022-06-26 18:51:34.000000000 +0200 @@ -35,7 +35,8 @@ int id; //avfid; streamtype::type type; std::string infostring; - AVCodec *dec,*enc; + const AVCodec *dec; + const AVCodec *enc; AVCodecContext *avcc; stream() : id(-1),type(streamtype::unknown),dec(0),enc(0),avcc(0) {} @@ -55,7 +56,6 @@ if (avcc) av_free(avcc); avcc=avcodec_alloc_context3(NULL); - avcodec_get_context_defaults3(avcc, NULL); } void setvideoencodingparameters(int tb_num, int tb_den, bool interlaced=false) {
