Merge pull request omniosorg#1443 from hadfl/minidlna

hyvanix · Apr 14, 2024 · 8f2bd21 · 8f2bd21
2 parents a20d92f + d6655e8
commit 8f2bd21
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/build/minidlna/patches/ffmpeg_7.patch b/build/minidlna/patches/ffmpeg_7.patch
diff --git a/build/minidlna/patches/libavformat_61.patch b/build/minidlna/patches/libavformat_61.patch
@@ -0,0 +1,15 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/libav.h a/libav.h
+--- a~/libav.h	1970-01-01 00:00:00
++++ a/libav.h	1970-01-01 00:00:00
+@@ -174,7 +174,11 @@ lav_get_interlaced(AVStream *s)
+ #define lav_codec_tag(s) s->codecpar->codec_tag
+ #define lav_sample_rate(s) s->codecpar->sample_rate
+ #define lav_bit_rate(s) s->codecpar->bit_rate
++#if LIBAVFORMAT_VERSION_MAJOR >= 61
++#define lav_channels(s) s->codecpar->ch_layout.nb_channels
++#else
+ #define lav_channels(s) s->codecpar->channels
++#endif
+ #define lav_width(s) s->codecpar->width
+ #define lav_height(s) s->codecpar->height
+ #define lav_profile(s) s->codecpar->profile
diff --git a/build/minidlna/patches/series b/build/minidlna/patches/series
@@ -4,4 +4,4 @@ minissdp.c.patch
 monitor.c.patch
 icons.c.patch
 select_use_after_free.patch
-ffmpeg_7.patch
+libavformat_61.patch