diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/encoding-example-profiles.conf | 34 | ||||
| -rw-r--r-- | etc/example.conf | 6 | ||||
| -rw-r--r-- | etc/input.conf | 8 | ||||
| -rw-r--r-- | etc/mplayer.desktop | 27 |
4 files changed, 24 insertions, 51 deletions
diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf index 5dc2908599..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,19 +26,19 @@ # 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 # ################ [enc-a-aac] profile-desc = "AAC (libfaac or FFmpeg)" -oac = libfaac,aac +oac = libfdk_aac,libfaac,libvo_aacenc,aac oacopts = b=128k [enc-a-ac3] @@ -124,33 +124,33 @@ ofopts-clr = yes # target devices # ################## [enc-to-dvdpal] -profile-desc = "DVD-Video PAL, use dvdauthor -v pal+4:3 -a ac3+en" +profile-desc = "DVD-Video PAL, use dvdauthor -v pal -a ac3+en (MUST be used with 4:3 or 16:9 aspect, and 720x576, 704x576, 352x576 or 352x288 resolution)" profile = enc-v-mpeg2 profile = enc-a-ac3 of = dvd ofopts-add = packetsize=2048,muxrate=10080000 ofps = 25 oharddup = yes -vf = expand=aspect=4/3,scale=720:576 +ovfirst = yes # dvdauthor needs this srate = 48000 ovcopts-add = g=15,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008 [enc-to-dvdntsc] -profile-desc = "DVD-Video NTSC, use dvdauthor -v ntsc+4:3 -a ac3+en" +profile-desc = "DVD-Video NTSC, use dvdauthor -v ntsc -a ac3+en (MUST be used with 4:3 or 16:9 aspect, and 720x480, 704x480, 352x480 or 352x240 resolution)" profile = enc-v-mpeg2 profile = enc-a-ac3 of = dvd ofopts-add = packetsize=2048,muxrate=10080000 ofps = 24000/1001 oharddup = yes -vf-add = expand=aspect=4/3,scale=720:480 +ovfirst = yes # dvdauthor needs this srate = 48000 ovcopts-add = g=18,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008 [enc-to-bb-9000] profile-desc = "MP4 for Blackberry Bold 9000" profile = enc-f-mp4 -vf-add = scale=480:-2 +vf-add = scale=w=480:h=-2:noup=2,scale=h=-2 # second scaler serves to fix aspect ratio in case "noup" of the first scaler has hit ovcopts-add = maxrate=1500k,bufsize=1000k,rc_init_occupancy=900k,refs=1,profile=baseline oacopts-add = b=96k @@ -158,7 +158,7 @@ oacopts-add = b=96k profile-desc = "3GP for Nokia 6300" profile = enc-f-3gp ofps = 25 -vf-add = scale=176:144 +vf-add = scale=w=176:h=144 srate = 16000 channels = 1 oacopts-add = b=32k @@ -167,7 +167,7 @@ oacopts-add = b=32k profile-desc = "MP4 for PlayStation Portable" profile = enc-f-mp4 ofps = 30000/1001 -vf-add = scale=480:272,dsize=480:270 +vf-add = scale=w=480:h=272,dsize=w=480:h=270 srate = 48000 channels = 2 ovcopts-add = b=512k,profile=baseline @@ -176,7 +176,7 @@ ovcopts-add = b=512k,profile=baseline profile-desc = "MP4 for iPhone" profile = enc-f-mp4 oautofps = yes # iphone supports 30fps max -vf-add = scale=-2:320 # half native screen res is probably best here, full res is no fun on tiny display anyway +vf-add = scale=w=-2:h=320:noup=2 # half native screen res is probably best here, full res is no fun on tiny display anyway ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline oacopts-add = b=128k @@ -184,6 +184,6 @@ oacopts-add = b=128k profile-desc = "MP4 for iPhone 4 (960x640)" profile = enc-f-mp4 oautofps = yes # iphone supports 30fps max -vf-add = scale=-2:640 # native screen res +vf-add = scale=w=-2:h=640:noup=2 # native screen res ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline oacopts-add = b=128k 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 f85d3785d8..f9906b23a4 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=no-default-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; |