Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xjadeo for openSUSE:Factory checked in at 2022-07-13 13:45:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xjadeo (Old) and /work/SRC/openSUSE:Factory/.xjadeo.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xjadeo" Wed Jul 13 13:45:39 2022 rev:6 rq:988943 version:0.8.11 Changes: -------- --- /work/SRC/openSUSE:Factory/xjadeo/xjadeo.changes 2021-01-28 21:22:31.991650265 +0100 +++ /work/SRC/openSUSE:Factory/.xjadeo.new.1523/xjadeo.changes 2022-07-13 13:46:03.102088313 +0200 @@ -1,0 +2,9 @@ +Tue Jul 12 19:49:58 UTC 2022 - Bj??rn Lie <[email protected]> + +- Update to version 0.8.11: + * Add compatibility for ffmpeg-5.0 + * Update static-builder to use ffmpeg-5.0 + * Add support for modern mingw (pthread) + * Update git clone URIs - avoid git:// + +------------------------------------------------------------------- Old: ---- xjadeo-0.8.10.tar.gz New: ---- xjadeo-0.8.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xjadeo.spec ++++++ --- /var/tmp/diff_new_pack.mbqxV9/_old 2022-07-13 13:46:03.662089107 +0200 +++ /var/tmp/diff_new_pack.mbqxV9/_new 2022-07-13 13:46:03.666089113 +0200 @@ -1,7 +1,7 @@ # # spec file for package xjadeo # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2015 Packman Team <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: xjadeo -Version: 0.8.10 +Version: 0.8.11 Release: 0 Summary: Video player that gets sync from Jack License: GPL-2.0-or-later ++++++ xjadeo-0.8.10.tar.gz -> xjadeo-0.8.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/ChangeLog new/xjadeo-0.8.11/ChangeLog --- old/xjadeo-0.8.10/ChangeLog 2021-01-06 16:11:31.000000000 +0100 +++ new/xjadeo-0.8.11/ChangeLog 2022-04-01 03:05:19.000000000 +0200 @@ -1,3 +1,9 @@ +2022-04-01 (0.8.11) Robin Gareus <[email protected]> +* add compatibility for ffmpeg-5.0 +* update static-builder to use ffmpeg-5.0 +* add support for modern mingw (pthread) +* update git clone URIs - avoid git:// + 2021-01-06 (0.8.10) Robin Gareus <[email protected]> * add keyboard shortcuts for +/- 1 second offsets * tweak Windows installer 32/64bit reg-keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/Makefile.in new/xjadeo-0.8.11/Makefile.in --- old/xjadeo-0.8.10/Makefile.in 2021-01-06 16:24:25.000000000 +0100 +++ new/xjadeo-0.8.11/Makefile.in 2022-04-01 03:52:32.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,8 +167,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -231,6 +231,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -701,6 +703,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -743,6 +749,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -758,7 +766,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -925,7 +933,7 @@ am--refresh check check-am clean clean-cscope clean-generic \ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-zstd distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/README new/xjadeo-0.8.11/README --- old/xjadeo-0.8.10/README 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.11/README 2022-03-20 15:30:41.000000000 +0100 @@ -8,7 +8,7 @@ Basic build instructions ------------------------ -git clone git://github.com/x42/xjadeo.git +git clone https://github.com/x42/xjadeo.git ./autogen.sh ./configure make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/aclocal.m4 new/xjadeo-0.8.11/aclocal.m4 --- old/xjadeo-0.8.10/aclocal.m4 2021-01-06 16:20:21.000000000 +0100 +++ new/xjadeo-0.8.11/aclocal.m4 2022-04-01 03:52:27.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,9 +20,9 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright ?? 2004 Scott James Remnant <[email protected]>. dnl Copyright ?? 2012-2015 Dan Nicholson <[email protected]> dnl @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,7 +296,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -311,7 +311,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,14 +327,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -386,7 +386,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -417,7 +417,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -608,7 +608,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -647,7 +647,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -674,7 +676,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -871,7 +873,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -892,7 +894,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -913,7 +915,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -956,7 +958,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -977,12 +979,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -997,7 +994,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1024,7 +1021,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1053,7 +1050,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1100,7 +1097,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1119,7 +1116,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1200,7 +1197,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1260,7 +1257,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1288,7 +1285,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1307,7 +1304,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/config.h new/xjadeo-0.8.11/config.h --- old/xjadeo-0.8.10/config.h 2021-01-06 16:20:24.000000000 +0100 +++ new/xjadeo-0.8.11/config.h 2022-04-01 03:52:31.000000000 +0200 @@ -226,7 +226,7 @@ /* #undef TTFFONTFILE */ /* Version number of package */ -#define VERSION "0.8.10" +#define VERSION "0.8.11" /* enable xjadeo windows context-menu */ #define WINMENU 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/configure new/xjadeo-0.8.11/configure --- old/xjadeo-0.8.10/configure 2021-01-06 16:20:21.000000000 +0100 +++ new/xjadeo-0.8.11/configure 2022-04-01 03:52:28.000000000 +0200 @@ -2740,7 +2740,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=10 +VERSION_SUB=11 am__api_version='1.16' @@ -2918,12 +2918,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -6602,8 +6597,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 -$as_echo_n "checking for JACK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack" >&5 +$as_echo_n "checking for jack... " >&6; } if test -n "$JACK_CFLAGS"; then pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" @@ -6643,7 +6638,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -6661,7 +6656,7 @@ as_fn_error $? "Could not fine JACK audio development kit - jackaudio.org." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Could not fine JACK audio development kit - jackaudio.org." "$LINENO" 5 else @@ -6740,8 +6735,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5 -$as_echo_n "checking for FFMPEG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavformat libavcodec libavutil libswscale" >&5 +$as_echo_n "checking for libavformat libavcodec libavutil libswscale... " >&6; } if test -n "$FFMPEG_CFLAGS"; then pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS" @@ -6781,7 +6776,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -6804,7 +6799,7 @@ Both are supported but xjadeo is developed and tested with the former. " "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? " Could not find ffmpeg. Please set PKG_CONFIG_PATH to @@ -6895,8 +6890,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLO" >&5 -$as_echo_n "checking for LIBLO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblo" >&5 +$as_echo_n "checking for liblo... " >&6; } if test -n "$LIBLO_CFLAGS"; then pkg_cv_LIBLO_CFLAGS="$LIBLO_CFLAGS" @@ -6936,7 +6931,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -6954,7 +6949,7 @@ NOFAIL=0 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } NOFAIL=0 else @@ -7031,8 +7026,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPM" >&5 -$as_echo_n "checking for XPM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5 +$as_echo_n "checking for xpm... " >&6; } if test -n "$XPM_CFLAGS"; then pkg_cv_XPM_CFLAGS="$XPM_CFLAGS" @@ -7072,7 +7067,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7090,7 +7085,7 @@ as_fn_error $? "Xpm support is mandatory on this platform - install libxpm development package." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Xpm support is mandatory on this platform - install libxpm development package." "$LINENO" 5 else @@ -7153,8 +7148,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 -$as_echo_n "checking for SDL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdl" >&5 +$as_echo_n "checking for sdl... " >&6; } if test -n "$SDL_CFLAGS"; then pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" @@ -7194,7 +7189,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7212,7 +7207,7 @@ NOFAIL=0 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } NOFAIL=0 else @@ -7232,8 +7227,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5 -$as_echo_n "checking for GL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glu gl" >&5 +$as_echo_n "checking for glu gl... " >&6; } if test -n "$GL_CFLAGS"; then pkg_cv_GL_CFLAGS="$GL_CFLAGS" @@ -7273,7 +7268,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7291,7 +7286,7 @@ NOFAIL=0 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } NOFAIL=0 else @@ -7311,8 +7306,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMLIB2" >&5 -$as_echo_n "checking for IMLIB2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for imlib2 >= 1.3.0" >&5 +$as_echo_n "checking for imlib2 >= 1.3.0... " >&6; } if test -n "$IMLIB2_CFLAGS"; then pkg_cv_IMLIB2_CFLAGS="$IMLIB2_CFLAGS" @@ -7352,7 +7347,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7370,7 +7365,7 @@ NOFAIL=0 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } NOFAIL=0 else @@ -7582,8 +7577,8 @@ FREETYPE_CFLAGS= pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5 -$as_echo_n "checking for FREETYPE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 +$as_echo_n "checking for freetype2... " >&6; } if test -n "$FREETYPE_CFLAGS"; then pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" @@ -7623,7 +7618,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7641,7 +7636,7 @@ freetype_pkgconfig=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } freetype_pkgconfig=no else @@ -7733,8 +7728,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LTC" >&5 -$as_echo_n "checking for LTC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ltc" >&5 +$as_echo_n "checking for ltc... " >&6; } if test -n "$LTC_CFLAGS"; then pkg_cv_LTC_CFLAGS="$LTC_CFLAGS" @@ -7774,7 +7769,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7792,7 +7787,7 @@ NOFAIL=0 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } NOFAIL=0 else @@ -9434,7 +9429,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/configure.ac new/xjadeo-0.8.11/configure.ac --- old/xjadeo-0.8.10/configure.ac 2021-01-06 16:11:40.000000000 +0100 +++ new/xjadeo-0.8.11/configure.ac 2022-04-01 03:02:55.000000000 +0200 @@ -8,7 +8,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=10 +VERSION_SUB=11 AM_INIT_AUTOMAKE(xjadeo, [${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}]) AM_CONFIG_HEADER(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/contrib/cli-remote/Makefile.am new/xjadeo-0.8.11/contrib/cli-remote/Makefile.am --- old/xjadeo-0.8.10/contrib/cli-remote/Makefile.am 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.11/contrib/cli-remote/Makefile.am 2021-01-22 07:21:31.000000000 +0100 @@ -5,7 +5,7 @@ ../../src/xjadeo/smpte.c ../../src/xjadeo/common_jack.c \ ../../src/xjadeo/weak_libjack.c -jadeo_rcli_CFLAGS = -Wall -g -O3 -I../../src/xjadeo/ @MIDI_CFLAGS@ @JACK_CFLAGS@ +jadeo_rcli_CFLAGS = -Wall -g -O3 -pthread -I../../src/xjadeo/ @MIDI_CFLAGS@ @JACK_CFLAGS@ jadeo_rcli_LDADD = @MIDI_LIBS@ -lm if TARGET_LINUX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/contrib/cli-remote/Makefile.in new/xjadeo-0.8.11/contrib/cli-remote/Makefile.in --- old/xjadeo-0.8.10/contrib/cli-remote/Makefile.in 2021-01-06 16:24:25.000000000 +0100 +++ new/xjadeo-0.8.11/contrib/cli-remote/Makefile.in 2022-04-01 03:52:32.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -323,8 +323,8 @@ ../../src/xjadeo/smpte.c ../../src/xjadeo/common_jack.c \ ../../src/xjadeo/weak_libjack.c -jadeo_rcli_CFLAGS = -Wall -g -O3 -I../../src/xjadeo/ @MIDI_CFLAGS@ \ - @JACK_CFLAGS@ $(am__append_2) $(am__append_4) +jadeo_rcli_CFLAGS = -Wall -g -O3 -pthread -I../../src/xjadeo/ \ + @MIDI_CFLAGS@ @JACK_CFLAGS@ $(am__append_2) $(am__append_4) jadeo_rcli_LDADD = @MIDI_LIBS@ -lm $(am__append_1) $(am__append_3) \ $(am__append_5) MAINTAINERCLEANFILES = Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/doc/xjadeo.1 new/xjadeo-0.8.11/doc/xjadeo.1 --- old/xjadeo-0.8.10/doc/xjadeo.1 2021-01-06 16:24:31.000000000 +0100 +++ new/xjadeo-0.8.11/doc/xjadeo.1 2022-04-01 03:52:39.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH XJADEO "1" "January 2021" "xjadeo version 0.8.10" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. +.TH XJADEO "1" "April 2022" "xjadeo version 0.8.11" "User Commands" .SH NAME xjadeo \- X Jack Video Monitor .SH SYNOPSIS @@ -362,9 +362,9 @@ Website: <http://xjadeo.sf.net/> .TP built from: -scm\-v0.8.10 +scm\-v0.8.11 .IP -compiled with: AVFORMAT=0x3a1464 AVCODEC=0x3a2364 AVUTIL:0x381664 +compiled with: AVFORMAT=0x3a2d64 AVCODEC=0x3a5b64 AVUTIL:0x383364 configuration: [ LTC JACK\-SESSION POSIX\-MQueue OSC ] .br MTC/MIDI: [ jack\-midi alsa\-sequencer portmidi alsa\-raw ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/doc/xjremote.1 new/xjadeo-0.8.11/doc/xjremote.1 --- old/xjadeo-0.8.10/doc/xjremote.1 2021-01-06 16:24:31.000000000 +0100 +++ new/xjadeo-0.8.11/doc/xjremote.1 2022-04-01 03:52:39.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH XJREMOTE "1" "January 2021" "xjremote version 0.8.10" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. +.TH XJREMOTE "1" "April 2022" "xjremote version 0.8.11" "User Commands" .SH NAME xjremote \- X Jack Video Monitor Remote Control .SH SYNOPSIS @@ -54,7 +54,7 @@ Website: <https://github.com/x42/xjadeo> .TP built from: -scm\-v0.8.10 +scm\-v0.8.11 .TP configuration: [ POSIX\-MQueue ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/src/Makefile.in new/xjadeo-0.8.11/src/Makefile.in --- old/xjadeo-0.8.10/src/Makefile.in 2021-01-06 16:24:25.000000000 +0100 +++ new/xjadeo-0.8.11/src/Makefile.in 2022-04-01 03:52:32.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/src/qt-gui/Makefile.in new/xjadeo-0.8.11/src/qt-gui/Makefile.in --- old/xjadeo-0.8.10/src/qt-gui/Makefile.in 2021-01-06 16:24:25.000000000 +0100 +++ new/xjadeo-0.8.11/src/qt-gui/Makefile.in 2022-04-01 03:52:32.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/src/xjadeo/Makefile.in new/xjadeo-0.8.11/src/xjadeo/Makefile.in --- old/xjadeo-0.8.10/src/xjadeo/Makefile.in 2021-01-06 16:24:25.000000000 +0100 +++ new/xjadeo-0.8.11/src/xjadeo/Makefile.in 2022-04-01 03:52:32.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1084,7 +1084,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1235,7 +1236,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-xjadeoDATA -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/src/xjadeo/ffcompat.h new/xjadeo-0.8.11/src/xjadeo/ffcompat.h --- old/xjadeo-0.8.10/src/xjadeo/ffcompat.h 2015-11-22 13:33:00.000000000 +0100 +++ new/xjadeo-0.8.11/src/xjadeo/ffcompat.h 2022-02-06 01:31:51.000000000 +0100 @@ -58,6 +58,27 @@ # endif #endif +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 63, 100) +static inline void avcodec_free_context (AVCodecContext ** avctx) +{ + avcodec_close (*avctx); +} +#endif + +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 25, 100) +static inline void av_packet_unref (AVPacket *pkt) +{ + av_free_packet (pkt); +} +#endif + +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 63, 100) +static inline int av_image_get_buffer_size (enum AVPixelFormat pix_fmt, int width, int height, int align) +{ + return avpicture_get_size (pix_fmt, width, height) +} +#endif + #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 2, 0) static inline int avformat_open_input(AVFormatContext **ps, const char *filename, void *fmt, void **options) { @@ -117,4 +138,16 @@ } #endif +static inline void +register_codecs_compat () +{ +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) + av_register_all(); +#endif +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100) + avcodec_register_all(); +#endif +} + + #endif /* FFCOMPAT_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.10/src/xjadeo/xjadeo.c new/xjadeo-0.8.11/src/xjadeo/xjadeo.c --- old/xjadeo-0.8.10/src/xjadeo/xjadeo.c 2020-05-22 04:40:25.000000000 +0200 +++ new/xjadeo-0.8.11/src/xjadeo/xjadeo.c 2022-02-06 03:14:58.000000000 +0100 @@ -428,31 +428,34 @@ } void init_moviebuffer (void) { - if (buffer) free (buffer); + if (buffer) av_free (buffer); if (want_debug) printf("DEBUG: init_moviebuffer - render_fmt: %i\n",render_fmt); /* Determine required buffer size and allocate buffer */ #ifdef CROPIMG - vbufsize = avpicture_get_size (render_fmt, movie_width*2, movie_height); + vbufsize = av_image_get_buffer_size (render_fmt, movie_width*2, movie_height, 64); #else - vbufsize = avpicture_get_size (render_fmt, movie_width, movie_height); + vbufsize = av_image_get_buffer_size (render_fmt, movie_width, movie_height, 64); #endif - buffer = (uint8_t *)calloc (1, vbufsize); + buffer = (uint8_t *)av_malloc (vbufsize); // Assign appropriate parts of buffer to image planes in pFrameFMT if (pFrameFMT) { +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 63, 100) avpicture_fill ((AVPicture *)pFrameFMT, buffer, render_fmt, movie_width, movie_height); +#else + av_image_fill_arrays (pFrameFMT->data, pFrameFMT->linesize, buffer, render_fmt, movie_width, movie_height, 64); +#endif pSWSCtx = sws_getContext (pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, movie_width, movie_height, render_fmt, SWS_BICUBIC, NULL, NULL, NULL); } render_empty_frame (0, 0); } void avinit (void) { - av_register_all (); + register_codecs_compat(); #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 20, 0) avcodec_init (); #endif - avcodec_register_all (); if (!want_avverbose) av_log_set_level (AV_LOG_QUIET); } @@ -473,7 +476,7 @@ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 49, 100) if (pts == AV_NOPTS_VALUE) { - pts = av_frame_get_best_effort_timestamp (f); + pts = f->best_effort_timestamp; if (pts != AV_NOPTS_VALUE) { if (!(pts_warn & 1) && !want_quiet) fprintf(stderr, "PTS: Best effort.\n"); @@ -485,7 +488,11 @@ #endif if (pts == AV_NOPTS_VALUE) { +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 61, 100) pts = f->pkt_pts; +#else + pts = f->pts; +#endif if (pts != AV_NOPTS_VALUE) { if (!(pts_warn & 2) && !want_quiet) fprintf(stderr, "Used PTS from packet instead frame's PTS.\n"); @@ -586,14 +593,14 @@ if (err != AVERROR_EOF) { if (!want_quiet) fprintf(stderr, "Read failed (during seek)\n"); - av_free_packet (packet); + av_packet_unref (packet); return -1; } else { --bailout; } } if (packet->stream_index != videoStream) { - av_free_packet (packet); + av_packet_unref (packet); continue; } @@ -612,11 +619,27 @@ int frameFinished = 0; #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 21, 0) err = avcodec_decode_video (pCodecCtx, pFrame, &frameFinished, packet->data, packet->size); -#else +#elif LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 106, 102) err = avcodec_decode_video2 (pCodecCtx, pFrame, &frameFinished, packet); +#else + err = avcodec_send_packet (pCodecCtx, packet); + if (err == AVERROR_EOF) { + err = 0; + } + frameFinished = 0; + if (err >= 0) { + err = avcodec_receive_frame (pCodecCtx, pFrame); + if (err < 0) { + if (err == AVERROR(EAGAIN) || err == AVERROR_EOF) { + err = 0; + } + } else { + frameFinished = 1; + } + } #endif - av_free_packet (packet); + av_packet_unref (packet); if (err < 0) { if (!want_quiet) @@ -767,7 +790,7 @@ while (!want_noindex && av_read_frame (pFormatCtx, &packet) >= 0) { if (abort_indexing) { if (!want_quiet) fprintf(stderr, "Indexing aborted.\n"); - av_free_packet (&packet); + av_packet_unref (&packet); return -1; } #ifdef USE_DUP_PACKET @@ -778,7 +801,7 @@ } #endif if (packet.stream_index != videoStream) { - av_free_packet (&packet); + av_packet_unref (&packet); continue; } @@ -798,14 +821,14 @@ if (ts == AV_NOPTS_VALUE) { if (!want_quiet) fprintf(stderr, "Index error: no PTS, nor DTS.\n"); - av_free_packet (&packet); + av_packet_unref (&packet); error |= 1; break; } const uint8_t key = (packet.flags & AV_PKT_FLAG_KEY) ? 1 : 0; if (add_idx (ts, packet.pos, key, packet.duration, tb)) { - av_free_packet (&packet); + av_packet_unref (&packet); break; } @@ -817,7 +840,7 @@ } } - av_free_packet (&packet); + av_packet_unref (&packet); if (++keyframe_interval > max_keyframe_interval) { max_keyframe_interval = keyframe_interval; @@ -904,7 +927,7 @@ if (err == AVERROR_EOF) { fprintf(stderr, "IDX2: Read/Seek compensate for premature EOF\n"); fidx[i].key = 0; - av_free_packet (&packet); + av_packet_unref (&packet); break; } fprintf(stderr, "IDX2: Read failed @ %"PRId64" / %"PRId64".\n", i, fcnt); @@ -922,11 +945,27 @@ if (packet.stream_index==videoStream) { #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 21, 0) err = avcodec_decode_video (pCodecCtx, pFrame, &got_pic, packet.data, packet.size); -#else +#elif LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 106, 102) err = avcodec_decode_video2 (pCodecCtx, pFrame, &got_pic, &packet); +#else + err = avcodec_send_packet (pCodecCtx, &packet); + if (err == AVERROR_EOF) { + err = 0; + } + got_pic = 0; + if (err >= 0) { + err = avcodec_receive_frame (pCodecCtx, pFrame); + if (err < 0) { + if (err == AVERROR(EAGAIN) || err == AVERROR_EOF) { + err = 0; + } + } else { + got_pic = 1; + } + } #endif } - av_free_packet (&packet); + av_packet_unref (&packet); if (err < 0) { break; @@ -949,7 +988,7 @@ if (err < 0 || !bailout) continue; fidx[i].frame_pts = pts; - fidx[i].frame_pos = av_frame_get_pkt_pos (pFrame); + fidx[i].frame_pos = pFrame->pkt_pos; if (pts != AV_NOPTS_VALUE) { #if 0 // DEBUG printf("FN %"PRId64", PKT-PTS %"PRId64" FRM-PTS: %"PRId64"\n", i, fidx[i].pkt_pts, fidx[i].frame_pts); @@ -1023,7 +1062,7 @@ if (av_read_frame (pFormatCtx, &packet) < 0) { byte_seek = 0; printf("NOBYTE 3\n"); - av_free_packet (&packet); + av_packet_unref (&packet); break; } @@ -1043,7 +1082,7 @@ #endif } - av_free_packet (&packet); + av_packet_unref (&packet); if (err < 0) { byte_seek = 0; @@ -1086,7 +1125,7 @@ if (av_read_frame (pFormatCtx, &packet) < 0) { fprintf(stderr, "IDX2: Read failed.\n"); - av_free_packet (&packet); + av_packet_unref (&packet); break; } @@ -1104,7 +1143,7 @@ avcodec_decode_video2 (pCodecCtx, pFrame, &got_pic, &packet); #endif } - av_free_packet (&packet); + av_packet_unref (&packet); if (!got_pic) { //--bailout; continue; @@ -1300,7 +1339,11 @@ /* Find the first video stream */ for (i = 0; i < pFormatCtx->nb_streams; ++i) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100) if (pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) { +#else + if (pFormatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { +#endif videoStream = i; break; } @@ -1319,7 +1362,6 @@ * hence here AVRational fractions are inverse. */ framerate = 0; -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55, 0, 100) // 9cf788eca8ba (merge a75f01d7e0) { AVRational fr = av_stream->r_frame_rate; if (fr.den > 0 && fr.num > 0) { @@ -1328,16 +1370,6 @@ fr_Q.num = fr.den; } } -#else - { - AVRational fr = av_stream_get_r_frame_rate (av_stream); - if (fr.den > 0 && fr.num > 0) { - framerate = av_q2d (fr); - fr_Q.den = fr.num; - fr_Q.num = fr.den; - } - } -#endif if (framerate < 1 || framerate > 1000) { AVRational fr = av_stream->avg_frame_rate; if (fr.den > 0 && fr.num > 0) { @@ -1396,7 +1428,12 @@ } // Get a pointer to the codec context for the video stream +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100) pCodecCtx=pFormatCtx->streams[videoStream]->codec; +#else + pCodecCtx = avcodec_alloc_context3(NULL); + avcodec_parameters_to_context (pCodecCtx, pFormatCtx->streams[videoStream]->codecpar); +#endif if (!want_quiet) { fprintf(stdout, "frame rate: %g\n", framerate); @@ -1418,8 +1455,13 @@ float sample_aspect = 1.0; if (av_stream->sample_aspect_ratio.num) sample_aspect = av_q2d (av_stream->sample_aspect_ratio); +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100) else if (av_stream->codec->sample_aspect_ratio.num) sample_aspect = av_q2d (av_stream->codec->sample_aspect_ratio); +#else + else if (av_stream->codecpar->sample_aspect_ratio.num) + sample_aspect = av_q2d (av_stream->codecpar->sample_aspect_ratio); +#endif else sample_aspect = 1.0; @@ -1476,7 +1518,7 @@ if (pFrame == NULL) { if (!want_quiet) fprintf(stderr, "Cannot allocate video frame buffer\n"); - avcodec_close (pCodecCtx); + avcodec_free_context (&pCodecCtx); avformat_close_input (&pFormatCtx); pFormatCtx = NULL; pCodecCtx = NULL; @@ -1488,7 +1530,7 @@ if (!want_quiet) fprintf(stderr, "Cannot allocate display frame buffer\n"); av_free (pFrame); - avcodec_close (pCodecCtx); + avcodec_free_context (&pCodecCtx); avformat_close_input (&pFormatCtx); pFormatCtx = NULL; pCodecCtx = NULL; @@ -1513,9 +1555,15 @@ if (av_stream->sample_aspect_ratio.num) sprintf(OSD_nfo_geo[2], "SAR: %d : %d", av_stream->sample_aspect_ratio.num, av_stream->sample_aspect_ratio.den); +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100) else if (av_stream->codec->sample_aspect_ratio.num) sprintf(OSD_nfo_geo[2], "SAR: %d : %d", av_stream->codec->sample_aspect_ratio.num, av_stream->codec->sample_aspect_ratio.den); +#else + else if (av_stream->codecpar->sample_aspect_ratio.num) + sprintf(OSD_nfo_geo[2], "SAR: %d : %d", + av_stream->codecpar->sample_aspect_ratio.num, av_stream->codecpar->sample_aspect_ratio.den); +#endif else sprintf(OSD_nfo_geo[2], "SAR: unknown (1 : 1)"); @@ -1581,7 +1629,7 @@ buffer[i+3] = 0xff; } } else { - memset (buffer, 0, avpicture_get_size (render_fmt, movie_width, movie_height)); + memset (buffer, 0, av_image_get_buffer_size (render_fmt, movie_width, movie_height, 1)); } #ifdef DRAW_CROSS int x,y; @@ -1798,7 +1846,7 @@ sws_freeContext (pSWSCtx); // Free the formatted image - if (buffer) free (buffer); + if (buffer) av_free (buffer); buffer=NULL; if (pFrameFMT) av_free (pFrameFMT); @@ -1810,7 +1858,7 @@ pFrame=NULL; //Close the codec - avcodec_close (pCodecCtx); + avcodec_free_context (&pCodecCtx); //Close the video file avformat_close_input (&pFormatCtx);
