<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/79129bafafda9e364ed2637aadd6570d3d12e55e">https://github.com/macports/macports-ports/commit/79129bafafda9e364ed2637aadd6570d3d12e55e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 79129bafafda9e364ed2637aadd6570d3d12e55e
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 30 07:21:11 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> VLC2: fix for gcc14, revbump
</span>---
multimedia/VLC2/Portfile | 12 ++-
multimedia/VLC2/files/backport-fixes.patch | 128 ++++++++++++++++++++++++
multimedia/VLC2/files/patch-ffmpeg4-compat.diff | 37 +++----
3 files changed, 158 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/Portfile b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f93f9557ab1..c6f1f8416ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ universal_variant no
</span> ##
if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
version 2.2.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 19
</span> license GPL-2+
master_sites https://download.videolan.org/pub/videolan/vlc/${version}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> size 22137276
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:a52dec \
port:avahi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,6 +164,14 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> patch-vlc-no-O4.diff \
patch-soundfont-path.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Cherry-picked from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/videolan/vlc/commit/667c3a73b19d056821ba7a64420a4623aae40222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/videolan/vlc/commit/ab00e6c59d42e05ab08893091783d8b5febc0058
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/videolan/vlc/commit/87724691c899a02d94fb64a3ef16868d65f3551b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/videolan/vlc/commit/77b86f4452be4dbe0d56a9cd1b66da61b116da60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Needed at least to fix gcc14 build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append backport-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[string match *clang* ${configure.compiler}]} {
patchfiles-append \
patch-static_assert.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/backport-fixes.patch b/multimedia/VLC2/files/backport-fixes.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d8a3048d80d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/files/backport-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,128 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/access/avio.c.orig 2015-10-22 00:58:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/access/avio.c 2024-09-30 04:06:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,8 +152,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *psz_opts = var_InheritString(access, "avio-options");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = avio_open2(&sys->context, url, AVIO_FLAG_READ, &cb, &options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,8 +239,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *psz_opts = var_InheritString(access, "sout-avio-options");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = avio_open2(&sys->context, access->psz_path, AVIO_FLAG_WRITE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/avcodec.c.orig 2015-04-14 03:54:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/avcodec.c 2024-09-30 04:08:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -429,8 +429,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *psz_opts = var_InheritString( p_dec, "avcodec-options" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_avcodec_lock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/subtitle.c.orig 2015-12-01 21:06:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/subtitle.c 2024-09-30 04:12:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,8 +90,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *psz_opts = var_InheritString(dec, "avcodec-options");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_avcodec_lock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/demux/avformat/demux.c.orig 2016-01-17 01:44:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/demux/avformat/demux.c 2024-09-30 04:12:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,8 +333,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int nb_streams = p_sys->ic->nb_streams;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned i = 1; i < nb_streams; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options[i] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options[0] = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned i = 1; i < nb_streams; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_dict_copy(&options[i], options[0], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/demux/avformat/mux.c.orig 2015-10-22 01:11:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/demux/avformat/mux.c 2024-09-30 04:14:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -374,8 +374,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *psz_opts = var_GetNonEmptyString( p_mux, "sout-avformat-options" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = avformat_write_header( p_sys->oc, options ? &options : NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVDictionaryEntry *t = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/video_chroma/swscale.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/video_chroma/swscale.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -589,8 +589,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filter_sys_t *p_sys = p_filter->p_sys;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t palette[AVPALETTE_SIZE];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t *src[4]; int src_stride[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t *dst[4]; int dst_stride[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t *src[4], *dst[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const uint8_t *csrc[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int src_stride[4], dst_stride[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_src, i_plane_count, b_swap_uvi );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -607,11 +608,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_dst, i_plane_count, b_swap_uvo );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (size_t i = 0; i < ARRAY_SIZE(src); i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ csrc[i] = src[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sws_scale( ctx, src, src_stride, 0, i_height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sws_scale( ctx, csrc, src_stride, 0, i_height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst, dst_stride );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sws_scale_ordered( ctx, src, src_stride, 0, i_height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst, dst_stride );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/video_filter/deinterlace/yadif.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/video_filter/deinterlace/yadif.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,11 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void yadif_filter_line_c_16bit(uint16_t *dst, uint16_t *prev, uint16_t *cur, uint16_t *next, int w, int prefs, int mrefs, int parity, int mode) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t *dst = (uint16_t *)dst8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t *prev = (uint16_t *)prev8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t *cur = (uint16_t *)cur8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t *next = (uint16_t *)next8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t *prev2= parity ? prev : cur ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t *next2= parity ? cur : next;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/patch-ffmpeg4-compat.diff b/multimedia/VLC2/files/patch-ffmpeg4-compat.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c7487358b76..a3b26211fa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/files/patch-ffmpeg4-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/files/patch-ffmpeg4-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,27 +2,30 @@ diff --git modules/codec/avcodec/avcommon.h modules/codec/avcodec/avcommon.h
</span> index f967473b472af234a740accdff5ac30a0ea91a81..e8f0a067f88655018214bba192e9fe9c4aefc167 100644
--- modules/codec/avcodec/avcommon.h
+++ modules/codec/avcodec/avcommon.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,20 @@ static inline AVDictionary *vlc_av_get_options(const char *psz_opts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return options;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,19 +45,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AV_OPTIONS_TEXT "Advanced options"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2}."
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline void vlc_av_get_options_ng(const char *psz_opts, AVDictionary** pp_dict)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config_chain_t *cfg = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config_ChainParseOptions(&cfg, psz_opts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (cfg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config_chain_t *next = cfg->p_next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static inline AVDictionary *vlc_av_get_options(const char *psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline void vlc_av_get_options(const char *psz_opts, AVDictionary** pp_dict)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_chain_t *cfg = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_ChainParseOptions(&cfg, psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (cfg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_chain_t *next = cfg->p_next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av_dict_set(&options, cfg->psz_name, cfg->psz_value,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
</span> + av_dict_set(pp_dict, cfg->psz_name, cfg->psz_value, 0);
+ free(cfg->psz_name);
+ free(cfg->psz_value);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(cfg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cfg = next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(cfg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> static inline void vlc_init_avutil(vlc_object_t *obj)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int level = AV_LOG_QUIET;
</span> diff --git modules/codec/avcodec/avcommon_compat.h modules/codec/avcodec/avcommon_compat.h
index 3c66a1e1b30a2ac742adbe40225cc363590c9b98..d3864448b7f059cfc72fc84262e8e728de8a6c0a 100644
--- modules/codec/avcodec/avcommon_compat.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -700,7 +703,7 @@ index 9020576e0c0b3533c9d9760c3474941c43a6bd0c..d7d45e7183f1bf393df77cda972ee1fb
</span> - options = vlc_av_get_options(psz_opts);
- free(psz_opts);
+ if (psz_opts) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vlc_av_get_options_ng(psz_opts, options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options(psz_opts, &options);
</span> + free(psz_opts);
+ }
</pre><pre style='margin:0'>
</pre>