Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits: 99ea4e70 by Marvin Scholz at 2021-12-02T18:11:46+00:00 NSIS: Add DAV file extension association (cherry picked from commit 608eff9a36cf096cf9398e65a4c9817e1f09fe42) Signed-off-by: Marvin Scholz <[email protected]> - - - - - 4d467d9e by Marvin Scholz at 2021-12-02T18:11:46+00:00 macosx: Add DAV file extension association (manual backport of d18a840b7b38b0a9cd3d189865219ec514b30f34) - - - - - e70b3532 by Marvin Scholz at 2021-12-02T18:11:46+00:00 vlc_interface: Add DAV file extension (cherry picked from commit d0cdf8e5e1589f7b933edc6c71a55dc9a2f6b7d5) Signed-off-by: Marvin Scholz <[email protected]> - - - - - 0b52a373 by Marvin Scholz at 2021-12-02T18:11:46+00:00 msi: add DAV file extension association (cherry picked from commit 82347d93d526df00c1ebf73805534b7f4081859a) Signed-off-by: Marvin Scholz <[email protected]> - - - - - 9226bae4 by Marvin Scholz at 2021-12-02T18:11:46+00:00 NEWS: Mention DAV support - - - - - 5 changed files: - NEWS - extras/package/win32/NSIS/helpers/extensions.nsh - extras/package/win32/msi/extensions.wxs - include/vlc_interface.h - share/Info.plist.in Changes: ===================================== NEWS ===================================== @@ -4,6 +4,9 @@ Changes between 3.0.16 and 3.0.17: Audio Output: * iOS/tvOS: add support for spatial audio +Demux: + * Support for DAV video files + Changes between 3.0.15 and 3.0.16: ---------------------------------- ===================================== extras/package/win32/NSIS/helpers/extensions.nsh ===================================== @@ -190,6 +190,7 @@ FunctionEnd !insertmacro ${_action} Video ".asf" !insertmacro ${_action} Video ".avi" !insertmacro ${_action} Video ".bik" + !insertmacro ${_action} Video ".dav" !insertmacro ${_action} Video ".divx" !insertmacro ${_action} Video ".drc" !insertmacro ${_action} Video ".dv" ===================================== extras/package/win32/msi/extensions.wxs ===================================== @@ -413,6 +413,14 @@ <Verb Id='enqueue' Command='Enqueue in VLC media player' TargetFile="vlc.exe" Argument="--started-from-file --playlist-enqueue "%1"" /> </Extension> </ProgId> + <RegistryValue Root="HKLM" Key="Software\Clients\Media\VLC\Capabilities\FileAssociations" Name=".dav" Value="VLC.dav.Document" Type="string" /> + <RegistryValue Root="HKCR" Key="Applications\vlc.exe\SupportedTypes" Name=".dav" Value="" Type="string" /> + <ProgId Id='VLC.dav.Document' Description='Video File' Icon='vlc.ico' Advertise='no'> + <Extension Id='dav'> + <Verb Id='open' Command='Play with VLC media player' TargetFile="vlc.exe" Argument="--started-from-file --no-playlist-enqueue "%1"" /> + <Verb Id='enqueue' Command='Enqueue in VLC media player' TargetFile="vlc.exe" Argument="--started-from-file --playlist-enqueue "%1"" /> + </Extension> + </ProgId> <RegistryValue Root="HKLM" Key="Software\Clients\Media\VLC\Capabilities\FileAssociations" Name=".divx" Value="VLC.divx.Document" Type="string" /> <RegistryValue Root="HKCR" Key="Applications\vlc.exe\SupportedTypes" Name=".divx" Value="" Type="string" /> <ProgId Id='VLC.divx.Document' Description='Video File' Icon='vlc.ico' Advertise='no'> ===================================== include/vlc_interface.h ===================================== @@ -155,7 +155,7 @@ typedef enum vlc_intf_dialog { "oga", "ogg", "oma", "opus", "qcp", "ra", "rmi", "s3m", "sid", "spx", "tak", "thd", "tta", \ "voc", "vqf", "w64", "wav", "wma", "wv", "xa", "xm" -#define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", "avi", "bik", "crf", "divx", "drc", "dv", "dvr-ms" \ +#define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", "avi", "bik", "crf", "dav", "divx", "drc", "dv", "dvr-ms" \ "evo", "f4v", "flv", "gvi", "gxf", "iso", \ "m1v", "m2v", "m2t", "m2ts", "m4v", "mkv", "mov",\ "mp2", "mp2v", "mp4", "mp4v", "mpe", "mpeg", "mpeg1", \ @@ -223,7 +223,7 @@ typedef enum vlc_intf_dialog { "*.xa;" \ "*.xm" -#define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bik;*.bin;*.crf;*.divx;*.drc;*.dv;*.dvr-ms;*.evo;*.f4v;*.flv;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;" \ +#define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bik;*.bin;*.crf;*.dav;*.divx;*.drc;*.dv;*.dvr-ms;*.evo;*.f4v;*.flv;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;" \ "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpe;*.mpeg;*.mpeg1;" \ "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.mxg;*.nsv;*.nuv;" \ "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ ===================================== share/Info.plist.in ===================================== @@ -356,6 +356,18 @@ <key>CFBundleTypeRole</key> <string>Viewer</string> </dict> + <dict> + <key>CFBundleTypeIconFile</key> + <string>movie.icns</string> + <key>CFBundleTypeName</key> + <string>DAV Video File</string> + <key>CFBundleTypeRole</key> + <string>Viewer</string> + <key>LSItemContentTypes</key> + <array> + <string>org.videolan.dav</string> + </array> + </dict> <dict> <key>CFBundleTypeExtensions</key> <array> @@ -2366,6 +2378,23 @@ </array> </dict> </dict> + <dict> + <key>UTTypeConformsTo</key> + <array> + <string>public.video</string> + </array> + <key>UTTypeDescription</key> + <string>DAV Video File</string> + <key>UTTypeIdentifier</key> + <string>org.videolan.dav</string> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <array> + <string>dav</string> + </array> + </dict> + </dict> <dict> <key>UTTypeConformsTo</key> <array> View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2437484d7684a4661048df1e095484a276bbea0b...9226bae4920ae575f5249fab95c7e5abfeee4031 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2437484d7684a4661048df1e095484a276bbea0b...9226bae4920ae575f5249fab95c7e5abfeee4031 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
