[SCM] vlc/experimental: Drop patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Sep 25 21:59:13 UTC 2017
The following commit has been merged in the experimental branch:
commit 7f2fb93fbc4d69073252311d1c265ce4611a47d5
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Sep 25 23:02:02 2017 +0200
Drop patches
diff --git a/debian/patches/0001-Revert-invalid-translations.patch b/debian/patches/0001-Revert-invalid-translations.patch
deleted file mode 100644
index b7b9cb0..0000000
--- a/debian/patches/0001-Revert-invalid-translations.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Sebastian Ramacher <sramacher at debian.org>
-Date: Fri, 7 Apr 2017 18:44:36 +0200
-Subject: Revert invalid translations
-
-Bug: https://trac.videolan.org/vlc/ticket/16598
-Bug-Debian: https://bugs.debian.org/814258
----
- po/mr.po | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/po/mr.po b/po/mr.po
-index 831b622..11b96b4 100644
---- a/po/mr.po
-+++ b/po/mr.po
-@@ -21567,7 +21567,7 @@ msgstr "चालविण्याची यादी"
-
- #: modules/gui/qt4/menus.cpp:493
- msgid "Ctrl+L"
--msgstr "कंट्रोल + एल"
-+msgstr "Ctrl+L"
-
- #: modules/gui/qt4/menus.cpp:496
- msgid "Docked Playlist"
-@@ -21579,7 +21579,7 @@ msgstr "किमान आंतरपृष्ठ"
-
- #: modules/gui/qt4/menus.cpp:508
- msgid "Ctrl+H"
--msgstr "कंट्रोल + एच"
-+msgstr "Ctrl+H"
-
- #: modules/gui/qt4/menus.cpp:517
- msgid "&Fullscreen Interface"
-@@ -21735,7 +21735,7 @@ msgstr "मागे उडी मारा"
-
- #: modules/gui/qt4/menus.cpp:920
- msgid "Ctrl+T"
--msgstr "कंट्रोल + टी"
-+msgstr "Ctrl+T"
-
- #: modules/gui/qt4/menus.cpp:935
- msgid "Open &Network..."
diff --git a/debian/patches/0002-Move-MIME-types-in-desktop-file-to-separate-file-for.patch b/debian/patches/0002-Move-MIME-types-in-desktop-file-to-separate-file-for.patch
deleted file mode 100644
index 1ce5b54..0000000
--- a/debian/patches/0002-Move-MIME-types-in-desktop-file-to-separate-file-for.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From: Petter Reinholdtsen <pere at hungry.com>
-Date: Sun, 8 May 2016 20:27:24 +0200
-Subject: Move MIME types in desktop file to separate file for easier
- maintenance
-
-Move list of supported MIME types from vlc.desktop.in to vlc.desktop.mimetypes,
-with one mime type per line with the option of hash comments to associate
-information with the MIME types.
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- share/Makefile.am | 3 +-
- share/vlc.desktop.in | 2 +-
- share/vlc.desktop.mimetypes | 137 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 140 insertions(+), 2 deletions(-)
- create mode 100644 share/vlc.desktop.mimetypes
-
-diff --git a/share/Makefile.am b/share/Makefile.am
-index b08b3e8..f0be5ff 100644
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -6,11 +6,12 @@ appdatadir = $(datadir)/applications
- if !HAVE_WIN32
- appdata_DATA = vlc.desktop
- endif
--EXTRA_DIST += vlc.desktop.in
-+EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
- CLEANFILES += $(appdata_DATA)
-
- vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
- $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
-+ $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; sed -ie "s,\@MIMETYPES\@,$$mimetypes,g" tmp-$@
- $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
- $(AM_V_at)mv -f tmp-$@ $@
-
-diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
-index 4052cd1..19d4134 100644
---- a/share/vlc.desktop.in
-+++ b/share/vlc.desktop.in
-@@ -88,6 +88,6 @@ Icon=vlc
- Terminal=false
- Type=Application
- Categories=AudioVideo;Player;Recorder;
--MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;audio/ogg;video/ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;video/vnd.mpegurl;
-+MimeType=@MIMETYPES@
- X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
- Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast;
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-new file mode 100644
-index 0000000..f567458
---- /dev/null
-+++ b/share/vlc.desktop.mimetypes
-@@ -0,0 +1,137 @@
-+# List of MIME types to announce in the desktop file, to let desktop
-+# environments and browsers know which file types to pass on to VLC.
-+
-+# DV files
-+video/dv
-+
-+video/mpeg
-+
-+video/x-mpeg
-+
-+video/msvideo
-+
-+video/quicktime
-+
-+video/x-anim
-+
-+video/x-avi
-+
-+video/x-ms-asf
-+
-+video/x-ms-wmv
-+
-+video/x-msvideo
-+
-+video/x-nsv
-+
-+video/x-flc
-+
-+video/x-fli
-+
-+video/x-flv
-+
-+video/vnd.rn-realvideo
-+
-+video/mp4
-+
-+video/mp4v-es
-+
-+video/mp2t
-+
-+application/ogg
-+
-+application/x-ogg
-+
-+video/x-ogm+ogg
-+
-+audio/x-vorbis+ogg
-+
-+audio/ogg
-+
-+video/ogg
-+
-+application/x-matroska
-+
-+audio/x-matroska
-+
-+video/x-matroska
-+
-+video/webm
-+
-+audio/webm
-+
-+audio/x-mp3
-+
-+audio/x-mpeg
-+
-+audio/mpeg
-+
-+audio/x-wav
-+
-+audio/x-mpegurl
-+
-+audio/x-scpls
-+
-+audio/x-m4a
-+
-+audio/x-ms-asf
-+
-+audio/x-ms-asx
-+
-+audio/x-ms-wax
-+
-+application/vnd.rn-realmedia
-+
-+audio/x-real-audio
-+
-+audio/x-pn-realaudio
-+
-+application/x-flac
-+
-+audio/x-flac
-+
-+application/x-shockwave-flash
-+
-+misc/ultravox
-+
-+audio/vnd.rn-realaudio
-+
-+audio/x-pn-aiff
-+
-+audio/x-pn-au
-+
-+audio/x-pn-wav
-+
-+audio/x-pn-windows-acm
-+
-+image/vnd.rn-realpix
-+
-+audio/x-pn-realaudio-plugin
-+
-+application/x-extension-mp4
-+
-+audio/mp4
-+
-+audio/amr
-+
-+audio/amr-wb
-+
-+x-content/video-vcd
-+
-+x-content/video-svcd
-+
-+x-content/video-dvd
-+
-+x-content/audio-cdda
-+
-+x-content/audio-player
-+
-+application/xspf+xml
-+
-+x-scheme-handler/mms
-+
-+x-scheme-handler/rtmp
-+
-+x-scheme-handler/rtsp
-+
-+video/vnd.mpegurl
diff --git a/debian/patches/0003-Restructure-desktop-MIME-type-list-with-comments.patch b/debian/patches/0003-Restructure-desktop-MIME-type-list-with-comments.patch
deleted file mode 100644
index 71b7e84..0000000
--- a/debian/patches/0003-Restructure-desktop-MIME-type-list-with-comments.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From: Petter Reinholdtsen <pere at hungry.com>
-Date: Mon, 9 May 2016 11:52:20 +0200
-Subject: Restructure desktop MIME type list with comments
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- share/vlc.desktop.mimetypes | 168 ++++++++++++++++++--------------------------
- 1 file changed, 70 insertions(+), 98 deletions(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index f567458..edaf11a 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -1,137 +1,109 @@
- # List of MIME types to announce in the desktop file, to let desktop
- # environments and browsers know which file types to pass on to VLC.
-
--# DV files
--video/dv
--
--video/mpeg
--
--video/x-mpeg
-+# Ogg Vorbis and Theora
-+application/ogg # IANA-registered
-+application/x-ogg
-+audio/ogg # IANA-registered
-+audio/x-vorbis+ogg
-+video/ogg # IANA-registered
-+video/x-ogm+ogg
-
-+# Microsoft audio and video
-+audio/x-ms-asf
-+audio/x-ms-asx
-+audio/x-ms-wax
-+audio/x-pn-windows-acm
- video/msvideo
--
--video/quicktime
--
--video/x-anim
--
- video/x-avi
--
- video/x-ms-asf
--
- video/x-ms-wmv
--
- video/x-msvideo
-
--video/x-nsv
--
--video/x-flc
--
--video/x-fli
--
--video/x-flv
--
-+# Real audio and video
-+application/vnd.rn-realmedia
-+audio/vnd.rn-realaudio
-+audio/x-pn-realaudio
-+audio/x-pn-realaudio-plugin
-+audio/x-real-audio
- video/vnd.rn-realvideo
-
--video/mp4
--
--video/mp4v-es
--
-+# MPEG related audio, video and transport
-+application/x-extension-mp4
-+audio/mp4 # IANA-registered
-+audio/mpeg # IANA-registered
-+audio/x-m4a
-+audio/x-mp3
-+audio/x-mpeg
- video/mp2t
-+video/mp4 # IANA-registered
-+video/mp4v-es
-+video/mpeg
-+video/x-mpeg
-
--application/ogg
--
--application/x-ogg
--
--video/x-ogm+ogg
--
--audio/x-vorbis+ogg
--
--audio/ogg
--
--video/ogg
-+# FLAC lossless audio
-+application/x-flac
-+audio/x-flac
-
-+# Matroska container format
- application/x-matroska
--
- audio/x-matroska
--
- video/x-matroska
-
-+# WebM (Matroska + Vorbis + VP8)
- video/webm
--
- audio/webm
-
--audio/x-mp3
--
--audio/x-mpeg
-+# RTSP related
-+audio/amr
-+audio/amr-wb
-
--audio/mpeg
-+# URI scheme handlers (ie IP protocol support)
-+x-scheme-handler/mms
-+x-scheme-handler/rtmp
-+x-scheme-handler/rtsp
-
--audio/x-wav
-+# Linux desktop environment hooks for ISOs etc.
-+x-content/video-vcd
-+x-content/video-svcd
-+x-content/video-dvd
-+x-content/audio-cdda
-+x-content/audio-player
-
-+# Playlists / text/xml list with URLs
-+application/xspf+xml
- audio/x-mpegurl
--
- audio/x-scpls
-+video/vnd.mpegurl # IANA-registered
-
--audio/x-m4a
--
--audio/x-ms-asf
--
--audio/x-ms-asx
--
--audio/x-ms-wax
-+# Digital Video
-+video/dv
-
--application/vnd.rn-realmedia
-+# Apple QuickTime
-+video/quicktime # IANA-registered
-
--audio/x-real-audio
-+# IFF related formats
-+audio/x-pn-aiff
-+video/x-anim
-
--audio/x-pn-realaudio
-+# NullSoft video
-+video/x-nsv
-
--application/x-flac
-+# Autodesk animation format
-+video/x-flc
-+video/x-fli
-+video/x-flv
-
--audio/x-flac
-+# Audio sample formats
-+audio/x-wav
-+audio/x-pn-au
-+audio/x-pn-wav
-
-+# Adobe Flash player related
- application/x-shockwave-flash
-
-+# SHOUTcast 2
- misc/ultravox
-
--audio/vnd.rn-realaudio
--
--audio/x-pn-aiff
--
--audio/x-pn-au
--
--audio/x-pn-wav
--
--audio/x-pn-windows-acm
--
-+# RealPix
- image/vnd.rn-realpix
--
--audio/x-pn-realaudio-plugin
--
--application/x-extension-mp4
--
--audio/mp4
--
--audio/amr
--
--audio/amr-wb
--
--x-content/video-vcd
--
--x-content/video-svcd
--
--x-content/video-dvd
--
--x-content/audio-cdda
--
--x-content/audio-player
--
--application/xspf+xml
--
--x-scheme-handler/mms
--
--x-scheme-handler/rtmp
--
--x-scheme-handler/rtsp
--
--video/vnd.mpegurl
diff --git a/debian/patches/0004-Add-MIME-types-listed-in-the-VLC-browser-plugin.patch b/debian/patches/0004-Add-MIME-types-listed-in-the-VLC-browser-plugin.patch
deleted file mode 100644
index a014e52..0000000
--- a/debian/patches/0004-Add-MIME-types-listed-in-the-VLC-browser-plugin.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From: Petter Reinholdtsen <pere at hungry.com>
-Date: Sun, 8 May 2016 20:35:24 +0200
-Subject: Add MIME types listed in the VLC browser plugin
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- share/vlc.desktop.mimetypes | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index edaf11a..c762772 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -13,11 +13,15 @@ video/x-ogm+ogg
- audio/x-ms-asf
- audio/x-ms-asx
- audio/x-ms-wax
-+audio/x-ms-wma
- audio/x-pn-windows-acm
-+video/divx
- video/msvideo
- video/x-avi
- video/x-ms-asf
-+video/x-ms-asf-plugin
- video/x-ms-wmv
-+video/x-ms-wvx
- video/x-msvideo
-
- # Real audio and video
-@@ -26,10 +30,14 @@ audio/vnd.rn-realaudio
- audio/x-pn-realaudio
- audio/x-pn-realaudio-plugin
- audio/x-real-audio
-+audio/x-realaudio
- video/vnd.rn-realvideo
-
- # MPEG related audio, video and transport
-+application/mpeg4-iod # IANA-registered
-+application/mpeg4-muxcodetable
- application/x-extension-mp4
-+audio/m4a
- audio/mp4 # IANA-registered
- audio/mpeg # IANA-registered
- audio/x-m4a
-@@ -39,10 +47,14 @@ video/mp2t
- video/mp4 # IANA-registered
- video/mp4v-es
- video/mpeg
-+video/mpeg-system
-+video/x-m4v
- video/x-mpeg
-+video/x-mpeg-system
-
- # FLAC lossless audio
- application/x-flac
-+audio/flac
- audio/x-flac
-
- # Matroska container format
-@@ -55,8 +67,12 @@ video/webm
- audio/webm
-
- # RTSP related
-+audio/3gpp
-+audio/3gpp2
- audio/amr
- audio/amr-wb
-+video/3gpp
-+video/3gpp2
-
- # URI scheme handlers (ie IP protocol support)
- x-scheme-handler/mms
-@@ -90,14 +106,16 @@ video/x-anim
- video/x-nsv
-
- # Autodesk animation format
-+video/flv
- video/x-flc
- video/x-fli
- video/x-flv
-
- # Audio sample formats
--audio/x-wav
-+audio/wav
- audio/x-pn-au
- audio/x-pn-wav
-+audio/x-wav
-
- # Adobe Flash player related
- application/x-shockwave-flash
diff --git a/debian/patches/0005-Add-MIME-types-imported-from-Totem.patch b/debian/patches/0005-Add-MIME-types-imported-from-Totem.patch
deleted file mode 100644
index d616d85..0000000
--- a/debian/patches/0005-Add-MIME-types-imported-from-Totem.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From: Petter Reinholdtsen <pere at hungry.com>
-Date: Sun, 8 May 2016 22:22:41 +0200
-Subject: Add MIME types imported from Totem
-
-Some of them are commented, until we know more about them.
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- share/vlc.desktop.mimetypes | 63 ++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 62 insertions(+), 1 deletion(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index c762772..e2881ba 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -5,9 +5,11 @@
- application/ogg # IANA-registered
- application/x-ogg
- audio/ogg # IANA-registered
-+audio/x-vorbis
- audio/x-vorbis+ogg
- video/ogg # IANA-registered
- video/x-ogm+ogg
-+video/x-theora+ogg
-
- # Microsoft audio and video
- audio/x-ms-asf
-@@ -17,10 +19,14 @@ audio/x-ms-wma
- audio/x-pn-windows-acm
- video/divx
- video/msvideo
-+video/vnd.divx
- video/x-avi
- video/x-ms-asf
- video/x-ms-asf-plugin
-+video/x-ms-asx
-+video/x-ms-wm
- video/x-ms-wmv
-+video/x-ms-wmx
- video/x-ms-wvx
- video/x-msvideo
-
-@@ -34,10 +40,12 @@ audio/x-realaudio
- video/vnd.rn-realvideo
-
- # MPEG related audio, video and transport
--application/mpeg4-iod # IANA-registered
-+application/mpeg4-iod # IANA-registered
- application/mpeg4-muxcodetable
-+application/x-extension-m4a
- application/x-extension-mp4
- audio/m4a
-+audio/mp2
- audio/mp4 # IANA-registered
- audio/mpeg # IANA-registered
- audio/x-m4a
-@@ -51,6 +59,7 @@ video/mpeg-system
- video/x-m4v
- video/x-mpeg
- video/x-mpeg-system
-+video/x-mpeg2
-
- # FLAC lossless audio
- application/x-flac
-@@ -69,6 +78,8 @@ audio/webm
- # RTSP related
- audio/3gpp
- audio/3gpp2
-+audio/AMR # IANA-registered
-+audio/AMR-WB # IANA-registered
- audio/amr
- audio/amr-wb
- video/3gpp
-@@ -88,6 +99,7 @@ x-content/audio-player
-
- # Playlists / text/xml list with URLs
- application/xspf+xml
-+audio/mpegurl
- audio/x-mpegurl
- audio/x-scpls
- video/vnd.mpegurl # IANA-registered
-@@ -96,9 +108,12 @@ video/vnd.mpegurl # IANA-registered
- video/dv
-
- # Apple QuickTime
-+application/x-quicktime-media-link
-+application/x-quicktimeplayer
- video/quicktime # IANA-registered
-
- # IFF related formats
-+audio/x-aiff
- audio/x-pn-aiff
- video/x-anim
-
-@@ -106,6 +121,7 @@ video/x-anim
- video/x-nsv
-
- # Autodesk animation format
-+video/fli
- video/flv
- video/x-flc
- video/x-fli
-@@ -119,9 +135,54 @@ audio/x-wav
-
- # Adobe Flash player related
- application/x-shockwave-flash
-+application/x-flash-video
-
- # SHOUTcast 2
- misc/ultravox
-
- # RealPix
- image/vnd.rn-realpix
-+
-+# From the totem desktop file in Debian. These need more work.
-+application/mxf
-+#application/ram
-+application/sdp
-+#application/smil
-+#application/smil+xml
-+application/vnd.apple.mpegurl
-+application/vnd.ms-asf
-+application/vnd.ms-wpl
-+#application/x-netshow-channel
-+#application/x-shorten
-+#application/x-smil
-+audio/ac3
-+#audio/basic
-+#audio/midi
-+#audio/prs.sid
-+audio/x-ape
-+audio/x-gsm
-+audio/x-it
-+audio/x-mod
-+audio/x-musepack
-+audio/x-s3m
-+#audio/x-sbc
-+audio/x-speex
-+#audio/x-stm
-+audio/x-tta
-+audio/x-wavpack
-+audio/x-xm
-+#image/x-pict
-+#text/google-video-pointer
-+#text/x-google-video-pointer
-+video/3gp
-+#video/vivo
-+#video/vnd.vivo
-+#video/x-flic
-+#video/x-totem-stream
-+x-scheme-handler/icy
-+x-scheme-handler/icyx
-+x-scheme-handler/mmsh
-+#x-scheme-handler/net
-+#x-scheme-handler/pnm
-+x-scheme-handler/rtp
-+#x-scheme-handler/uvox
diff --git a/debian/patches/0006-vlc.desktop-mimetypes-reordering-and-comments.patch b/debian/patches/0006-vlc.desktop-mimetypes-reordering-and-comments.patch
deleted file mode 100644
index b58b47e..0000000
--- a/debian/patches/0006-vlc.desktop-mimetypes-reordering-and-comments.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Mon, 9 May 2016 13:35:19 +0200
-Subject: vlc.desktop mimetypes: reordering and comments
-
----
- share/vlc.desktop.mimetypes | 88 ++++++++++++++++++++++++---------------------
- 1 file changed, 47 insertions(+), 41 deletions(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index e2881ba..3ce8bb9 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -1,7 +1,7 @@
- # List of MIME types to announce in the desktop file, to let desktop
- # environments and browsers know which file types to pass on to VLC.
-
--# Ogg Vorbis and Theora
-+# Ogg Vorbis and Theora (Xiph family)
- application/ogg # IANA-registered
- application/x-ogg
- audio/ogg # IANA-registered
-@@ -11,16 +11,17 @@ video/ogg # IANA-registered
- video/x-ogm+ogg
- video/x-theora+ogg
-
-+# FLAC lossless audio
-+application/x-flac
-+audio/flac
-+audio/x-flac
-+
- # Microsoft audio and video
-+# ASF
- audio/x-ms-asf
- audio/x-ms-asx
- audio/x-ms-wax
- audio/x-ms-wma
--audio/x-pn-windows-acm
--video/divx
--video/msvideo
--video/vnd.divx
--video/x-avi
- video/x-ms-asf
- video/x-ms-asf-plugin
- video/x-ms-asx
-@@ -28,7 +29,13 @@ video/x-ms-wm
- video/x-ms-wmv
- video/x-ms-wmx
- video/x-ms-wvx
-+# AVI et al.
- video/x-msvideo
-+audio/x-pn-windows-acm
-+video/divx
-+video/msvideo
-+video/vnd.divx
-+video/x-avi
-
- # Real audio and video
- application/vnd.rn-realmedia
-@@ -40,55 +47,62 @@ audio/x-realaudio
- video/vnd.rn-realvideo
-
- # MPEG related audio, video and transport
-+# MPEG-2
-+audio/mp2
-+audio/mpeg # IANA-registered
-+audio/x-mp3
-+audio/x-mpeg
-+video/mp2t # TS
-+video/mpeg
-+video/mpeg-system
-+video/x-mpeg
-+video/x-mpeg2
-+video/x-mpeg-system
-+# MP4
- application/mpeg4-iod # IANA-registered
- application/mpeg4-muxcodetable
- application/x-extension-m4a
- application/x-extension-mp4
- audio/m4a
--audio/mp2
- audio/mp4 # IANA-registered
--audio/mpeg # IANA-registered
- audio/x-m4a
--audio/x-mp3
--audio/x-mpeg
--video/mp2t
- video/mp4 # IANA-registered
- video/mp4v-es
--video/mpeg
--video/mpeg-system
- video/x-m4v
--video/x-mpeg
--video/x-mpeg-system
--video/x-mpeg2
-
--# FLAC lossless audio
--application/x-flac
--audio/flac
--audio/x-flac
-+# Apple QuickTime (MOV)
-+application/x-quicktime-media-link
-+application/x-quicktimeplayer
-+video/quicktime # IANA-registered
-
- # Matroska container format
- application/x-matroska
- audio/x-matroska
- video/x-matroska
-
--# WebM (Matroska + Vorbis + VP8)
-+# WebM (Matroska + Vorbis/Opus + VP8/9)
- video/webm
- audio/webm
-
--# RTSP related
-+# 3GPP related
- audio/3gpp
- audio/3gpp2
- audio/AMR # IANA-registered
- audio/AMR-WB # IANA-registered
- audio/amr
- audio/amr-wb
-+video/3gp
- video/3gpp
- video/3gpp2
-
- # URI scheme handlers (ie IP protocol support)
--x-scheme-handler/mms
-+x-scheme-handler/mms # MMS
-+x-scheme-handler/mmsh # MMS over HTTP
-+x-scheme-handler/rtsp # RSTP
-+x-scheme-handler/rtp
- x-scheme-handler/rtmp
--x-scheme-handler/rtsp
-+x-scheme-handler/icy # Icecast
-+x-scheme-handler/icyx # Icecast
-
- # Linux desktop environment hooks for ISOs etc.
- x-content/video-vcd
-@@ -103,15 +117,13 @@ audio/mpegurl
- audio/x-mpegurl
- audio/x-scpls
- video/vnd.mpegurl # IANA-registered
-+application/vnd.apple.mpegurl # HLS / M3U8
-+application/vnd.ms-asf # ZPL/WVX
-+application/vnd.ms-wpl # WPL
-
- # Digital Video
- video/dv
-
--# Apple QuickTime
--application/x-quicktime-media-link
--application/x-quicktimeplayer
--video/quicktime # IANA-registered
--
- # IFF related formats
- audio/x-aiff
- audio/x-pn-aiff
-@@ -143,15 +155,18 @@ misc/ultravox
- # RealPix
- image/vnd.rn-realpix
-
-+# Modplug / GME
-+audio/x-it
-+audio/x-mod
-+audio/x-s3m
-+audio/x-xm
-+
- # From the totem desktop file in Debian. These need more work.
- application/mxf
- #application/ram
- application/sdp
- #application/smil
- #application/smil+xml
--application/vnd.apple.mpegurl
--application/vnd.ms-asf
--application/vnd.ms-wpl
- #application/x-netshow-channel
- #application/x-shorten
- #application/x-smil
-@@ -161,28 +176,19 @@ audio/ac3
- #audio/prs.sid
- audio/x-ape
- audio/x-gsm
--audio/x-it
--audio/x-mod
- audio/x-musepack
--audio/x-s3m
- #audio/x-sbc
- audio/x-speex
- #audio/x-stm
- audio/x-tta
- audio/x-wavpack
--audio/x-xm
- #image/x-pict
- #text/google-video-pointer
- #text/x-google-video-pointer
--video/3gp
- #video/vivo
- #video/vnd.vivo
- #video/x-flic
- #video/x-totem-stream
--x-scheme-handler/icy
--x-scheme-handler/icyx
--x-scheme-handler/mmsh
- #x-scheme-handler/net
- #x-scheme-handler/pnm
--x-scheme-handler/rtp
- #x-scheme-handler/uvox
diff --git a/debian/patches/0007-More-mimetypes-reordering-comments-and-additions.patch b/debian/patches/0007-More-mimetypes-reordering-comments-and-additions.patch
deleted file mode 100644
index 3466ab2..0000000
--- a/debian/patches/0007-More-mimetypes-reordering-comments-and-additions.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Mon, 9 May 2016 13:52:11 +0200
-Subject: More mimetypes reordering, comments and additions
-
----
- share/vlc.desktop.mimetypes | 48 +++++++++++++++++++++++++++++++++------------
- 1 file changed, 36 insertions(+), 12 deletions(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index 3ce8bb9..e33de40 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -10,6 +10,8 @@ audio/x-vorbis+ogg
- video/ogg # IANA-registered
- video/x-ogm+ogg
- video/x-theora+ogg
-+video/x-theora
-+audio/x-speex
-
- # FLAC lossless audio
- application/x-flac
-@@ -38,7 +40,8 @@ video/vnd.divx
- video/x-avi
-
- # Real audio and video
--application/vnd.rn-realmedia
-+application/vnd.rn-realmedia # RM
-+application/vnd.rn-realmedia-vbr # RMVB
- audio/vnd.rn-realaudio
- audio/x-pn-realaudio
- audio/x-pn-realaudio-plugin
-@@ -48,10 +51,16 @@ video/vnd.rn-realvideo
-
- # MPEG related audio, video and transport
- # MPEG-2
--audio/mp2
- audio/mpeg # IANA-registered
-+audio/mpg # IANA-registered
-+audio/mp1
-+audio/mp2
-+audio/mp3
-+audio/x-mp1
-+audio/x-mp2
- audio/x-mp3
- audio/x-mpeg
-+audio/x-mpg
- video/mp2t # TS
- video/mpeg
- video/mpeg-system
-@@ -63,9 +72,11 @@ application/mpeg4-iod # IANA-registered
- application/mpeg4-muxcodetable
- application/x-extension-m4a
- application/x-extension-mp4
-+audio/aac
- audio/m4a
- audio/mp4 # IANA-registered
- audio/x-m4a
-+audio/x-aac
- video/mp4 # IANA-registered
- video/mp4v-es
- video/x-m4v
-@@ -115,11 +126,13 @@ x-content/audio-player
- application/xspf+xml
- audio/mpegurl
- audio/x-mpegurl
-+audio/scpls
- audio/x-scpls
- video/vnd.mpegurl # IANA-registered
- application/vnd.apple.mpegurl # HLS / M3U8
- application/vnd.ms-asf # ZPL/WVX
- application/vnd.ms-wpl # WPL
-+application/sdp # SDP for RT*P
-
- # Digital Video
- video/dv
-@@ -145,6 +158,20 @@ audio/x-pn-au
- audio/x-pn-wav
- audio/x-wav
-
-+# Raw audio
-+audio/ac3
-+audio/vnd.dts # IANA DTS Audio
-+audio/vnd.dts.hd # IANA DTS-HD
-+audio/basic # IANA mulaw
-+audio/midi
-+# Weird audio formats
-+audio/x-ape
-+audio/x-gsm
-+audio/x-musepack
-+audio/x-tta
-+audio/x-wavpack
-+audio/x-shorten
-+
- # Adobe Flash player related
- application/x-shockwave-flash
- application/x-flash-video
-@@ -164,24 +191,14 @@ audio/x-xm
- # From the totem desktop file in Debian. These need more work.
- application/mxf
- #application/ram
--application/sdp
- #application/smil
- #application/smil+xml
- #application/x-netshow-channel
- #application/x-shorten
- #application/x-smil
--audio/ac3
--#audio/basic
--#audio/midi
- #audio/prs.sid
--audio/x-ape
--audio/x-gsm
--audio/x-musepack
- #audio/x-sbc
--audio/x-speex
- #audio/x-stm
--audio/x-tta
--audio/x-wavpack
- #image/x-pict
- #text/google-video-pointer
- #text/x-google-video-pointer
-@@ -192,3 +209,10 @@ audio/x-wavpack
- #x-scheme-handler/net
- #x-scheme-handler/pnm
- #x-scheme-handler/uvox
-+#
-+#application/streamingmedia
-+#application/x-streamingmedia
-+#audio/rn-mpeg
-+#audio/x-pn-windows-pcm
-+#video/x-ms-afs
-+#video/x-ms-wvxvideo
diff --git a/debian/patches/0008-desktop-file-We-understand-gvp-and-ram-format.patch b/debian/patches/0008-desktop-file-We-understand-gvp-and-ram-format.patch
deleted file mode 100644
index 3ee6973..0000000
--- a/debian/patches/0008-desktop-file-We-understand-gvp-and-ram-format.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Petter Reinholdtsen <pere at hungry.com>
-Date: Tue, 10 May 2016 13:19:43 +0200
-Subject: desktop file: We understand gvp and ram format
-
-And add more comments about IANA registration
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- share/vlc.desktop.mimetypes | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index e33de40..d7081f9 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -123,11 +123,14 @@ x-content/audio-cdda
- x-content/audio-player
-
- # Playlists / text/xml list with URLs
-+application/ram # Realaudio Metadata
- application/xspf+xml
- audio/mpegurl
- audio/x-mpegurl
- audio/scpls
- audio/x-scpls
-+text/google-video-pointer
-+text/x-google-video-pointer
- video/vnd.mpegurl # IANA-registered
- application/vnd.apple.mpegurl # HLS / M3U8
- application/vnd.ms-asf # ZPL/WVX
-@@ -189,21 +192,18 @@ audio/x-s3m
- audio/x-xm
-
- # From the totem desktop file in Debian. These need more work.
--application/mxf
--#application/ram
--#application/smil
--#application/smil+xml
-+application/mxf # IANA-registered
-+#application/smil # IANA-registered
-+#application/smil+xml # IANA-registered
- #application/x-netshow-channel
- #application/x-shorten
- #application/x-smil
--#audio/prs.sid
-+#audio/prs.sid # IANA-registered
- #audio/x-sbc
- #audio/x-stm
- #image/x-pict
--#text/google-video-pointer
--#text/x-google-video-pointer
- #video/vivo
--#video/vnd.vivo
-+#video/vnd.vivo # IANA-registered
- #video/x-flic
- #video/x-totem-stream
- #x-scheme-handler/net
diff --git a/debian/patches/0009-desktop-file-more-mimetypes-from-iana.org.patch b/debian/patches/0009-desktop-file-more-mimetypes-from-iana.org.patch
deleted file mode 100644
index a7a3837..0000000
--- a/debian/patches/0009-desktop-file-more-mimetypes-from-iana.org.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Tue, 10 May 2016 15:19:59 +0200
-Subject: desktop file: more mimetypes from iana.org
-
----
- share/vlc.desktop.mimetypes | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
-index d7081f9..8c2cf3b 100644
---- a/share/vlc.desktop.mimetypes
-+++ b/share/vlc.desktop.mimetypes
-@@ -12,6 +12,7 @@ video/x-ogm+ogg
- video/x-theora+ogg
- video/x-theora
- audio/x-speex
-+audio/opus # IANA-registered
-
- # FLAC lossless audio
- application/x-flac
-@@ -96,8 +97,8 @@ video/webm
- audio/webm
-
- # 3GPP related
--audio/3gpp
--audio/3gpp2
-+audio/3gpp # IANA-registered
-+audio/3gpp2 # IANA-registered
- audio/AMR # IANA-registered
- audio/AMR-WB # IANA-registered
- audio/amr
-@@ -138,7 +139,8 @@ application/vnd.ms-wpl # WPL
- application/sdp # SDP for RT*P
-
- # Digital Video
--video/dv
-+audio/dv # IANA-registered
-+video/dv # IANA-registered
-
- # IFF related formats
- audio/x-aiff
-@@ -162,9 +164,13 @@ audio/x-pn-wav
- audio/x-wav
-
- # Raw audio
--audio/ac3
-+audio/ac3 # IANA AC3
-+audio/eac3 # IANA E-AC3
- audio/vnd.dts # IANA DTS Audio
- audio/vnd.dts.hd # IANA DTS-HD
-+audio/vnd.dolby.heaac.1 # IANA Dolby HeAAC
-+audio/vnd.dolby.heaac.2 # IANA Dolby HeAAC
-+audio/vnd.dolby.mlp # IANA MLP/TrueHD
- audio/basic # IANA mulaw
- audio/midi
- # Weird audio formats
diff --git a/debian/patches/0010-MKV-support-WebVTT-subtitles-embedded.patch b/debian/patches/0010-MKV-support-WebVTT-subtitles-embedded.patch
deleted file mode 100644
index aab8abb..0000000
--- a/debian/patches/0010-MKV-support-WebVTT-subtitles-embedded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Wed, 15 Jul 2015 23:32:10 +0200
-Subject: MKV: support WebVTT subtitles embedded
-
----
- modules/demux/mkv/matroska_segment_parse.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
-index e8a6852..2620206 100644
---- a/modules/demux/mkv/matroska_segment_parse.cpp
-+++ b/modules/demux/mkv/matroska_segment_parse.cpp
-@@ -1837,6 +1837,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
- {
- p_tk->fmt.i_codec = VLC_CODEC_BD_PG;
- }
-+ else if( !strcmp( p_tk->psz_codec, "D_WEBVTT/SUBTITLES" ) )
-+ {
-+ p_tk->fmt.i_codec = VLC_CODEC_SUBT;
-+ p_tk->fmt.subs.psz_encoding = strdup( "UTF-8" );
-+ }
- else if( !strcmp( p_tk->psz_codec, "B_VOBBTN" ) )
- {
- p_tk->fmt.i_cat = NAV_ES;
diff --git a/debian/patches/0011-codec-avcodec-check-avcodec-visible-sizes.patch b/debian/patches/0011-codec-avcodec-check-avcodec-visible-sizes.patch
deleted file mode 100644
index 9955126..0000000
--- a/debian/patches/0011-codec-avcodec-check-avcodec-visible-sizes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Thu, 29 Jun 2017 09:45:20 +0200
-Subject: codec: avcodec: check avcodec visible sizes
-
-refs #18467
----
- modules/codec/avcodec/video.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
-index a19e7f6..b8b713f 100644
---- a/modules/codec/avcodec/video.c
-+++ b/modules/codec/avcodec/video.c
-@@ -137,9 +137,11 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
- }
-
-
-- if( width == 0 || height == 0 || width > 8192 || height > 8192 )
-+ if( width == 0 || height == 0 || width > 8192 || height > 8192 ||
-+ width < p_context->width || height < p_context->height )
- {
-- msg_Err( p_dec, "Invalid frame size %dx%d.", width, height );
-+ msg_Err( p_dec, "Invalid frame size %dx%d. vsz %dx%d",
-+ width, height, p_context->width, p_context->height );
- return NULL; /* invalid display size */
- }
- p_dec->fmt_out.video.i_width = width;
diff --git a/debian/patches/0012-decoder-check-visible-size-when-creating-buffer.patch b/debian/patches/0012-decoder-check-visible-size-when-creating-buffer.patch
deleted file mode 100644
index 9601a20..0000000
--- a/debian/patches/0012-decoder-check-visible-size-when-creating-buffer.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Thu, 29 Jun 2017 11:09:02 +0200
-Subject: decoder: check visible size when creating buffer
-
-early reject invalid visible size
-mishandled by filters.
-
-refs #18467
----
- src/input/decoder.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/input/decoder.c b/src/input/decoder.c
-index 9f7dc18..cfc15ed 100644
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -2060,7 +2060,9 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
- vout_thread_t *p_vout;
-
- if( !p_dec->fmt_out.video.i_width ||
-- !p_dec->fmt_out.video.i_height )
-+ !p_dec->fmt_out.video.i_height ||
-+ p_dec->fmt_out.video.i_width < p_dec->fmt_out.video.i_visible_width ||
-+ p_dec->fmt_out.video.i_height < p_dec->fmt_out.video.i_visible_height )
- {
- /* Can't create a new vout without display size */
- return NULL;
diff --git a/debian/patches/0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch b/debian/patches/0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
deleted file mode 100644
index 9e817cf..0000000
--- a/debian/patches/0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Wed, 31 May 2017 13:02:29 +0200
-Subject: codec: flac: fix heap write overflow on frame format change
-
-bp of 83b646f1e8fb89f99064d9aaef3754ccc77bbeac
----
- modules/codec/flac.c | 92 +++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 63 insertions(+), 29 deletions(-)
-
-diff --git a/modules/codec/flac.c b/modules/codec/flac.c
-index 8ab1cb4..8cb1222 100644
---- a/modules/codec/flac.c
-+++ b/modules/codec/flac.c
-@@ -64,6 +64,8 @@ struct decoder_sys_t
- */
- FLAC__StreamDecoder *p_flac;
- FLAC__StreamMetadata_StreamInfo stream_info;
-+
-+ uint8_t rgi_channels_reorder[AOUT_CHAN_MAX];
- bool b_stream_info;
- };
-
-@@ -87,6 +89,19 @@ static const int pi_channels_maps[9] =
- | AOUT_CHAN_LFE
- };
-
-+/* XXX it supposes our internal format is WG4 */
-+static const uint8_t ppi_reorder[1+8][8] = {
-+ { },
-+ { 0, },
-+ { 0, 1 },
-+ { 0, 1, 2 },
-+ { 0, 1, 2, 3 },
-+ { 0, 1, 3, 4, 2 },
-+ { 0, 1, 4, 5, 2, 3 },
-+ { 0, 1, 5, 6, 4, 2, 3 },
-+ { 0, 1, 6, 7, 4, 5, 2, 3 },
-+};
-+
- /*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-@@ -142,6 +157,29 @@ static void Interleave( int32_t *p_out, const int32_t * const *pp_in,
- }
- }
-
-+/*****************************************************************************
-+ * DecoderSetOutputFormat: helper function to convert and check frame format
-+ *****************************************************************************/
-+static int DecoderSetOutputFormat( unsigned i_channels, unsigned i_rate,
-+ unsigned i_streaminfo_rate,
-+ unsigned i_bitspersample,
-+ audio_format_t *fmt,
-+ uint8_t *pi_channels_reorder )
-+{
-+ if( i_channels == 0 || i_channels > FLAC__MAX_CHANNELS ||
-+ i_bitspersample == 0 || (i_rate == 0 && i_streaminfo_rate == 0) )
-+ return VLC_EGENERIC;
-+
-+ fmt->i_channels = i_channels;
-+ fmt->i_rate = (i_rate > 0 ) ? i_rate : i_streaminfo_rate;
-+ fmt->i_physical_channels =
-+ fmt->i_original_channels = pi_channels_maps[i_channels];
-+ memcpy( pi_channels_reorder, ppi_reorder[i_channels], i_channels );
-+ fmt->i_bitspersample = i_bitspersample;
-+
-+ return VLC_SUCCESS;
-+}
-+
- /*****************************************************************************
- * DecoderWriteCallback: called by libflac to output decoded samples
- *****************************************************************************/
-@@ -150,30 +188,31 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
- const FLAC__Frame *frame,
- const FLAC__int32 *const buffer[], void *client_data )
- {
-- /* XXX it supposes our internal format is WG4 */
-- static const unsigned char ppi_reorder[1+8][8] = {
-- { },
-- { 0, },
-- { 0, 1 },
-- { 0, 1, 2 },
-- { 0, 1, 2, 3 },
-- { 0, 1, 3, 4, 2 },
-- { 0, 1, 4, 5, 2, 3 },
-- { 0, 1, 5, 6, 4, 2, 3 },
-- { 0, 1, 6, 7, 4, 5, 2, 3 },
-- };
--
- VLC_UNUSED(decoder);
- decoder_t *p_dec = (decoder_t *)client_data;
- decoder_sys_t *p_sys = p_dec->p_sys;
-
-- if( p_dec->fmt_out.audio.i_channels <= 0 ||
-- p_dec->fmt_out.audio.i_channels > 8 )
-+ if( DecoderSetOutputFormat( frame->header.channels,
-+ frame->header.sample_rate,
-+ p_sys->b_stream_info ? p_sys->stream_info.sample_rate : 0,
-+ frame->header.bits_per_sample,
-+ &p_dec->fmt_out.audio,
-+ p_sys->rgi_channels_reorder ) )
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-- if( date_Get( &p_sys->end_date ) <= VLC_TS_INVALID )
-+
-+ if( p_sys->end_date.i_divider_num != p_dec->fmt_out.audio.i_rate )
-+ {
-+ if( p_sys->end_date.i_divider_num > 0 )
-+ date_Change( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
-+ else
-+ date_Init( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
-+ }
-+
-+ if( decoder_UpdateAudioFormat( p_dec ) )
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
-- const unsigned char *pi_reorder = ppi_reorder[p_dec->fmt_out.audio.i_channels];
-+ if( date_Get( &p_sys->end_date ) <= VLC_TS_INVALID )
-+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
- p_sys->p_aout_buffer =
- decoder_NewAudioBuffer( p_dec, frame->header.blocksize );
-@@ -181,7 +220,8 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
- if( p_sys->p_aout_buffer == NULL )
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
-- Interleave( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer, pi_reorder,
-+ Interleave( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer,
-+ p_sys->rgi_channels_reorder ,
- frame->header.channels, frame->header.blocksize,
- frame->header.bits_per_sample );
-
-@@ -233,17 +273,11 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder,
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- /* Setup the format */
-- p_dec->fmt_out.audio.i_rate = metadata->data.stream_info.sample_rate;
-- p_dec->fmt_out.audio.i_channels = metadata->data.stream_info.channels;
-- if(metadata->data.stream_info.channels < 9)
-- {
-- p_dec->fmt_out.audio.i_physical_channels =
-- p_dec->fmt_out.audio.i_original_channels =
-- pi_channels_maps[metadata->data.stream_info.channels];
-- }
-- if (!p_dec->fmt_out.audio.i_bitspersample)
-- p_dec->fmt_out.audio.i_bitspersample =
-- metadata->data.stream_info.bits_per_sample;
-+ DecoderSetOutputFormat( metadata->data.stream_info.channels,
-+ metadata->data.stream_info.sample_rate,
-+ metadata->data.stream_info.sample_rate,
-+ metadata->data.stream_info.bits_per_sample,
-+ &p_dec->fmt_out.audio, p_sys->rgi_channels_reorder );
-
- msg_Dbg( p_dec, "channels:%d samplerate:%d bitspersamples:%d",
- p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_rate,
diff --git a/debian/patches/0014-upnp-Add-support-for-libupnp-1.8.patch b/debian/patches/0014-upnp-Add-support-for-libupnp-1.8.patch
deleted file mode 100644
index 1bdd10a..0000000
--- a/debian/patches/0014-upnp-Add-support-for-libupnp-1.8.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Sebastian Ramacher <sebastian at ramacher.at>
-Date: Wed, 30 Aug 2017 18:31:34 +0200
-Subject: upnp: Add support for libupnp 1.8
-
-Callbacks now take const void* as second argument and some members can
-only be accessed via getter functions.
-
-Signed-off-by: Sebastian Ramacher <sramacher at debian.org>
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
-(cherry picked from commit 3eb4e03512f45c1fa27c7f9a6759e8e7d3905720)
----
- modules/services_discovery/upnp.cpp | 63 ++++++++++++++++++++++++++++++-------
- 1 file changed, 51 insertions(+), 12 deletions(-)
-
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
-index 4642ff9..ab61c5c 100644
---- a/modules/services_discovery/upnp.cpp
-+++ b/modules/services_discovery/upnp.cpp
-@@ -40,6 +40,44 @@
- #include <assert.h>
- #include <limits.h>
-
-+#if UPNP_VERSION < 10800
-+/*
-+ * Compat functions and typedefs for libupnp prior to 1.8
-+ */
-+typedef void* UpnpEventPtr;
-+typedef Upnp_Discovery UpnpDiscovery;
-+typedef Upnp_Action_Complete UpnpActionComplete;
-+typedef Upnp_Event UpnpEvent;
-+typedef Upnp_Event_Subscribe UpnpEventSubscribe;
-+
-+static const char* UpnpDiscovery_get_Location_cstr( const UpnpDiscovery* p_discovery )
-+{
-+ return p_discovery->Location;
-+}
-+
-+static const char* UpnpDiscovery_get_DeviceID_cstr( const UpnpDiscovery* p_discovery )
-+{
-+ return p_discovery->DeviceId;
-+}
-+
-+static IXML_Document* UpnpActionComplete_get_ActionResult( const UpnpActionComplete* p_result )
-+{
-+ return p_result->ActionResult;
-+}
-+
-+static const char* UpnpEvent_get_SID_cstr( const UpnpEvent* p_e )
-+{
-+ return p_e->Sid;
-+}
-+
-+static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_s )
-+{
-+ return p_s->Sid;
-+}
-+#else
-+typedef const void* UpnpEventPtr;
-+#endif
-+
- /*
- * Constants
- */
-@@ -80,7 +118,7 @@ vlc_module_end();
- /*
- * Local prototypes
- */
--static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data );
-+static int Callback( Upnp_EventType event_type, UpnpEventPtr p_event, void* p_user_data );
-
- const char* xml_getChildElementValue( IXML_Element* p_parent,
- const char* psz_tag_name );
-@@ -325,7 +363,7 @@ int xml_getNumber( IXML_Document* p_doc,
- /*
- * Handles all UPnP events
- */
--static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data )
-+static int Callback( Upnp_EventType event_type, UpnpEventPtr p_event, void* p_user_data )
- {
- services_discovery_t* p_sd = ( services_discovery_t* ) p_user_data;
- services_discovery_sys_t* p_sys = p_sd->p_sys;
-@@ -336,22 +374,23 @@ static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data
- case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
- case UPNP_DISCOVERY_SEARCH_RESULT:
- {
-- struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* )p_event;
-+ const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
-
- IXML_Document *p_description_doc = 0;
-
- int i_res;
-- i_res = UpnpDownloadXmlDoc( p_discovery->Location, &p_description_doc );
-+ i_res = UpnpDownloadXmlDoc( UpnpDiscovery_get_Location_cstr( p_discovery ), &p_description_doc );
-+
- if ( i_res != UPNP_E_SUCCESS )
- {
- msg_Warn( p_sd, "Could not download device description! "
- "Fetching data from %s failed: %s",
-- p_discovery->Location, UpnpGetErrorMessage( i_res ) );
-+ UpnpDiscovery_get_Location_cstr( p_discovery ), UpnpGetErrorMessage( i_res ) );
- return i_res;
- }
-
- MediaServer::parseDeviceDescription( p_description_doc,
-- p_discovery->Location, p_sd );
-+ UpnpDiscovery_get_Location_cstr( p_discovery ), p_sd );
-
- ixmlDocument_free( p_description_doc );
- }
-@@ -359,18 +398,18 @@ static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data
-
- case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
- {
-- struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* )p_event;
-+ const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
-
-- p_sys->p_server_list->removeServer( p_discovery->DeviceId );
-+ p_sys->p_server_list->removeServer( UpnpDiscovery_get_DeviceID_cstr( p_discovery ) );
-
- }
- break;
-
- case UPNP_EVENT_RECEIVED:
- {
-- Upnp_Event* p_e = ( Upnp_Event* )p_event;
-+ const UpnpEvent* p_e = ( const UpnpEvent* )p_event;
-
-- MediaServer* p_server = p_sys->p_server_list->getServerBySID( p_e->Sid );
-+ MediaServer* p_server = p_sys->p_server_list->getServerBySID( UpnpEvent_get_SID_cstr( p_e ) );
- if ( p_server ) p_server->fetchContents();
- }
- break;
-@@ -380,9 +419,9 @@ static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data
- {
- /* Re-subscribe. */
-
-- Upnp_Event_Subscribe* p_s = ( Upnp_Event_Subscribe* )p_event;
-+ const UpnpEventSubscribe* p_s = ( const UpnpEventSubscribe* )p_event;
-
-- MediaServer* p_server = p_sys->p_server_list->getServerBySID( p_s->Sid );
-+ MediaServer* p_server = p_sys->p_server_list->getServerBySID( UpnpEventSubscribe_get_SID_cstr( p_s ) );
- if ( p_server ) p_server->subscribeToContentDirectory();
- }
- break;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 21de7e1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,14 +0,0 @@
-0001-Revert-invalid-translations.patch
-0002-Move-MIME-types-in-desktop-file-to-separate-file-for.patch
-0003-Restructure-desktop-MIME-type-list-with-comments.patch
-0004-Add-MIME-types-listed-in-the-VLC-browser-plugin.patch
-0005-Add-MIME-types-imported-from-Totem.patch
-0006-vlc.desktop-mimetypes-reordering-and-comments.patch
-0007-More-mimetypes-reordering-comments-and-additions.patch
-0008-desktop-file-We-understand-gvp-and-ram-format.patch
-0009-desktop-file-more-mimetypes-from-iana.org.patch
-0010-MKV-support-WebVTT-subtitles-embedded.patch
-0011-codec-avcodec-check-avcodec-visible-sizes.patch
-0012-decoder-check-visible-size-when-creating-buffer.patch
-0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
-0014-upnp-Add-support-for-libupnp-1.8.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list