summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/encoding-example-profiles.conf14
-rw-r--r--etc/example.conf6
-rw-r--r--etc/input.conf8
-rw-r--r--etc/mplayer.desktop27
4 files changed, 14 insertions, 41 deletions
diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf
index 1a7ca6342c..f24c11d3ef 100644
--- a/etc/encoding-example-profiles.conf
+++ b/etc/encoding-example-profiles.conf
@@ -1,5 +1,5 @@
#
-# MPlayer configuration file
+# mpv configuration file
#
#########################
@@ -8,10 +8,10 @@
#
# Usage of this file: copy/symlink it to a fixed location, and add
# include = /path/to/this/encoding-example-profiles.conf
-# to your ~/.mplayer/config
+# to your ~/.mpv/config
#
# Then, list all profiles by
-# mplayer -profile help | grep enc-
+# mpv -profile help | grep enc-
#
# The following kinds of encoding profiles exist:
# enc-a-*: initialize an audio codec including good defaults
@@ -26,12 +26,12 @@
# options, or even switch to another codec.
#
# You can view the exact options a profile sets by
-# mplayer -show-profile enc-to-bb-9000
+# mpv -show-profile enc-to-bb-9000
#
# Examples:
-# mplayer -profile enc-to-dvdpal -o outfile.mpg infile.mkv
-# mplayer -profile enc-f-avi -ofps 30 -o outfile.avi infile.mkv
-# mplayer -profile enc-v-mpeg4 -ovcopts-add global_quality=7 -profile enc-a-mp3 -oacopts-add b=320k -o outfile.avi infile.mkv
+# mpv -profile enc-to-dvdpal -o outfile.mpg infile.mkv
+# mpv -profile enc-f-avi -ofps 30 -o outfile.avi infile.mkv
+# mpv -profile enc-v-mpeg4 -ovcopts-add global_quality=7 -profile enc-a-mp3 -oacopts-add b=320k -o outfile.avi infile.mkv
################
# audio codecs #
diff --git a/etc/example.conf b/etc/example.conf
index 588ec00b7e..a68dc39cca 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -1,8 +1,8 @@
#
-# MPlayer configuration file
+# mpv configuration file
#
-# Configuration files are read system-wide from /usr/local/etc/mplayer.conf
-# and per-user from ~/.mplayer/config, where per-user settings override
+# Configuration files are read system-wide from /usr/local/etc/mpv.conf
+# and per-user from ~/.mpv/config, where per-user settings override
# system-wide settings, all of which are overrriden by the command line.
#
# The configuration file settings are the same as the command line
diff --git a/etc/input.conf b/etc/input.conf
index 2dd9fee758..0dec4fa4b0 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -1,16 +1,16 @@
-# MPlayer input control file
+# mpv input control file
#
# You are able to redefine default keyboard/joystick/mouse/LIRC bindings, or
# add new ones here.
# See DOCS/tech/slave.txt for possible commands that can be bound.
-# Also see mplayer -input cmdlist for other possible options.
-# The file should be placed in the $HOME/.mplayer directory.
+# Also see mpv -input cmdlist for other possible options.
+# The file should be placed in the $HOME/.mpv directory.
#
# If you wish to unbind a key, use key ignore.
# e.g. ENTER ignore
#
# Note that merely removing default key bindings from this file won't remove
-# the default bindings mplayer was compiled with, unless
+# the default bindings mpv was compiled with, unless
# --input=nodefault-bindings
# is specified.
#
diff --git a/etc/mplayer.desktop b/etc/mplayer.desktop
deleted file mode 100644
index c7c9648524..0000000000
--- a/etc/mplayer.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer
-GenericName=Media Player
-GenericName[ca]=Reproductor multimèdia
-GenericName[de]=Medienwiedergabe
-GenericName[fr]=Lecteur multimédia
-GenericName[it]=Lettore multimediale
-GenericName[ja]=メディアプレーヤー
-X-GNOME-FullName=MPlayer Media Player
-X-GNOME-FullName[ca]=MPlayer Reproductor multimèdia
-X-GNOME-FullName[de]=MPlayer Medienwiedergabe
-X-GNOME-FullName[fr]=MPlayer Lecteur multimédia
-X-GNOME-FullName[it]=MPlayer Lettore multimediale
-X-GNOME-FullName[ja]=MPlayer メディアプレーヤー
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik wiedergeben
-Comment[fr]=Lit les films et musiques
-Comment[it]=Riproduce filmati e musica
-Comment[ja]=動画や音声のファイルを再生します
-Icon=mplayer
-TryExec=gmplayer
-Exec=gmplayer %F
-Terminal=false
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video;