From da3870519dffd9a04e0683caff974cdedd6e356d Mon Sep 17 00:00:00 2001
From: Yoni Rabkin <yonirabkin@member.fsf.org>
Date: Wed, 20 Aug 2014 15:42:47 -0400
Subject: Add FLV and WEBM formats.
Patch by Daimrod <daimrod@gmail.com>. Change too small for copyright.
---
lisp/emms-player-mplayer.el | 3 ++-
lisp/emms-player-vlc.el | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/emms-player-mplayer.el b/lisp/emms-player-mplayer.el
index 295c437..83b329d 100644
--- a/lisp/emms-player-mplayer.el
+++ b/lisp/emms-player-mplayer.el
@@ -38,7 +38,8 @@
(emms-player-simple-regexp
"ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma"
"mov" "avi" "divx" "ogm" "ogv" "asf" "mkv"
- "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"))
+ "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"
+ "flv" "webm"))
"mplayer" "-slave" "-quiet" "-really-quiet")
(define-emms-simple-player mplayer-playlist '(streamlist)
diff --git a/lisp/emms-player-vlc.el b/lisp/emms-player-vlc.el
index 08b0760..2e29363 100644
--- a/lisp/emms-player-vlc.el
+++ b/lisp/emms-player-vlc.el
@@ -34,7 +34,8 @@
(emms-player-simple-regexp
"ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma"
"mov" "avi" "divx" "ogm" "ogv" "asf" "mkv"
- "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"))
+ "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"
+ "flv" "webm"))
"vlc" "--intf=rc")
(define-emms-simple-player vlc-playlist '(streamlist)
--
cgit v1.2.3