Merge branch 'master' into osd_changes

Conflicts:
	Makefile
	command.c
	libvo/gl_common.c
	libvo/vo_corevideo.m
	libvo/vo_opengl.c
	libvo/vo_opengl_old.c
	libvo/vo_opengl_shaders.glsl
	sub/ass_mp.c
	sub/osd_libass.c
	sub/sd_ass.c

4 files changed, 103 insertions, 129 deletions

diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf
index 41f9dc4e66..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,26 +124,26 @@ 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-add = expand=aspect=4/3,scale=w=720:h=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=w=720:h=480
+ovfirst = yes # dvdauthor needs this
 srate = 48000
 ovcopts-add = g=18,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008
 
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..67ce10f72f 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -1,37 +1,38 @@
-# 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.
+# See DOCS/man/en/input.rst for possible commands that can be bound.
+# Also see mpv --input=cmdlist for other possible options.
+# The file should be placed in the $HOME/.mpv directory.
+#
+# mpv --input=test --pause dummy.mkv can be used to test which commands keys are
+# bound to.
 #
 # 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
-#   --input=nodefault-bindings
+# the default bindings mpv was compiled with, unless
+#   --input=no-default-bindings
 # is specified.
 #
 # Lines starting with # are comments. Use SHARP to assign the # key.
 #
-# Some characters need to be escaped. In particular, if you want to display
-# a '\' character as part of an osd_show_property_text OSD message, you have to
-# escape 2 times:
-# key  osd_show_property_text "This is a single backslash: \\\\!"
+# Strings need to be quoted and escaped:
+# KEY  show_text "This is a single backslash: \\ and a quote: \" !"
 #
 # You can use modifier-key combinations like Shift+Left or Ctrl+Alt+x with
 # modifiers Shift, Ctrl, Alt and Meta, but note that currently reading
 # key combinations is only supported through the video windows of certain
 # output drivers (not in output windows of other drivers or in a terminal).
 
-MOUSE_BTN0_DBL vo_fullscreen            # toggle fullscreen on/off
-MOUSE_BTN2 pause                        # toggle pause on/off
+MOUSE_BTN0_DBL cycle fullscreen         # toggle fullscreen on/off
+MOUSE_BTN2 cycle pause                  # toggle pause on/off
 MOUSE_BTN3 seek 10
 MOUSE_BTN4 seek -10
-MOUSE_BTN5 volume 1
-MOUSE_BTN6 volume -1
+MOUSE_BTN5 add volume 1
+MOUSE_BTN6 add volume -1
 
 # Seek units are in seconds, but note that these are limited by keyframes
 RIGHT seek  10
@@ -39,95 +40,95 @@ LEFT  seek -10
 UP    seek  60
 DOWN  seek -60
 # Do smaller, always exact (non-keyframe-limited), seeks with shift.
-Shift+RIGHT seek  1 0 1
-Shift+LEFT  seek -1 0 1
-Shift+UP    seek  5 0 1
-Shift+DOWN  seek -5 0 1
+# Don't show them on the OSD (no-osd).
+Shift+RIGHT no-osd seek  1 - exact
+Shift+LEFT  no-osd seek -1 - exact
+Shift+UP    no-osd seek  5 - exact
+Shift+DOWN  no-osd seek -5 - exact
 PGUP seek 600
 PGDWN seek -600
-+ audio_delay 0.100                     # this changes audio/video sync
-- audio_delay -0.100
++ add audio-delay 0.100                 # this changes audio/video sync
+- add audio-delay -0.100
 [ speed_mult 0.9091                     # scale playback speed
 ] speed_mult 1.1
 { speed_mult 0.5
 } speed_mult 2.0
-BS speed_set 1.0                        # reset speed to normal
+BS set speed 1.0                        # reset speed to normal
 q quit
 q {encode} quit
 ESC quit
-p pause                                 # toggle pause/playback mode
+p cycle pause                           # toggle pause/playback mode
 . frame_step                            # advance one frame and pause
-SPACE pause
+SPACE cycle pause
 > playlist_next                         # skip to next file
-ENTER playlist_next 1                   # skip to next file or quit
+ENTER playlist_next force               # skip to next file or quit
 < playlist_prev                         # skip to previous file
 o osd                                   # cycle through OSD mode
-I osd_show_property_text "${filename}"  # display filename in osd
-P osd_show_progression
-z sub_delay -0.1                        # subtract 100 ms delay from subs
-x sub_delay +0.1                        # add
+I show_text "${filename}"               # display filename in osd
+P show_progress
+z add sub-delay -0.1                    # subtract 100 ms delay from subs
+x add sub-delay +0.1                    # add
 g sub_step -1                           # immediately display next subtitle
 y sub_step +1                           #                     previous
-9 volume -1
-/ volume -1
-0 volume 1
-* volume 1
-( balance -0.1                          # adjust audio balance in favor of left
-) balance 0.1                           #                                  right
-m mute
-1 contrast -1
-2 contrast 1
-3 brightness -1
-4 brightness 1
-5 hue -1
-6 hue 1
-7 saturation -1
-8 saturation 1
-d frame_drop                            # cycle through framedrop modes
+9 add volume -1
+/ add volume -1
+0 add volume 1
+* add volume 1
+( add balance -0.1                      # adjust audio balance in favor of left
+) add balance 0.1                       #                                  right
+m cycle mute
+1 add contrast -1
+2 add contrast 1
+3 add brightness -1
+4 add brightness 1
+5 add hue -1
+6 add hue 1
+7 add saturation -1
+8 add saturation 1
+d cycle framedrop                       # cycle through framedrop modes
 # toggle deinterlacer; requires either vdpau output, -vf yadif or kerndeint
-D step_property_osd deinterlace
-c step_property_osd colormatrix
+D cycle deinterlace
+c cycle colormatrix
 # Next 3 currently only work with --no-ass
-r sub_pos -1                            # move subtitles up
-t sub_pos +1                            #                down
-v sub_visibility
+r add sub-pos -1                        # move subtitles up
+t add sub-pos +1                        #                down
+v cycle sub-visibility
 # stretch SSA/ASS subtitles with anamorphic videos to match historical
-V step_property_osd ass_vsfilter_aspect_compat
-j sub_select                            # cycle through subtitles
-J sub_select -3                         # ...backwards
-F forced_subs_only
-SHARP switch_audio                      # switch audio streams
-_ step_property switch_video
-TAB step_property switch_program
+V cycle ass-vsfilter-aspect-compat
+j cycle sub                             # cycle through subtitles
+J cycle sub down                        # ...backwards
+F cycle sub-forced-only
+SHARP cycle audio                       # switch audio streams
+_ cycle video
+TAB cycle program
 i edl_mark                              # for use with --edlout mode
-T vo_ontop                              # toggle video window ontop of other windows
-f vo_fullscreen                         # toggle fullscreen
-C step_property_osd capturing
-s screenshot 0                          # take a png screenshot
-S screenshot 1                          # ...on every frame
-Alt+s screenshot 0 1                    # take a screenshot of window contents
-Alt+S screenshot 1 1                    # ...on every frame
-w panscan -0.1                          # zoom out with -panscan 0 -fs
-e panscan +0.1                          #      in
+T cycle ontop                           # toggle video window ontop of other windows
+f cycle fullscreen                      # toggle fullscreen
+s screenshot                            # take a png screenshot
+S screenshot each-frame                 # ...on every frame
+Alt+s screenshot - window                    # take a screenshot of window contents
+Alt+S screenshot each-frame window      # ...on every frame
+w add panscan -0.1                      # zoom out with -panscan 0 -fs
+e add panscan +0.1                      #      in
 POWER quit
-MENU osd
-PLAY pause
-PAUSE pause
-PLAYPAUSE pause
+MENU cycle osd
+PLAY cycle pause
+PAUSE cycle pause
+PLAYPAUSE cycle pause
 STOP quit
 FORWARD seek 60
 REWIND seek -60
 NEXT playlist_next
 PREV playlist_prev
-VOLUME_UP volume 1
-VOLUME_DOWN volume -1
-MUTE mute
+VOLUME_UP add volume 1
+VOLUME_DOWN add volume -1
+MUTE cycle mute
 CLOSE_WIN quit
 CLOSE_WIN {encode} quit
-! seek_chapter -1                       # skip to previous chapter
-@ seek_chapter 1                        #         next
-E step_property_osd edition             # next edition
-A switch_angle 1
+! add chapter -1                        # skip to previous chapter
+@ add chapter 1                         #         next
+E cycle edition                         # next edition
+A cycle angle
 U stop
 
 # TV
@@ -140,16 +141,16 @@ u tv_step_chanlist
 # Apple Remote section
 #
 
-AR_PLAY pause
+AR_PLAY cycle pause
 AR_PLAY_HOLD quit
 AR_NEXT seek 30
 AR_NEXT_HOLD seek 120
 AR_PREV seek -10
 AR_PREV_HOLD seek -120
-AR_MENU osd
-AR_MENU_HOLD mute
-AR_VUP volume 1
-AR_VDOWN volume -1
+AR_MENU cycle osd
+AR_MENU_HOLD cycle mute
+AR_VUP add volume 1
+AR_VDOWN add volume -1
 
 #
 # Joystick section
@@ -161,15 +162,15 @@ JOY_AXIS0_PLUS seek 10
 JOY_AXIS0_MINUS seek -10
 JOY_AXIS1_MINUS seek 60
 JOY_AXIS1_PLUS seek -60
-JOY_BTN0 pause
-JOY_BTN1 osd
-JOY_BTN2 volume 1
-JOY_BTN3 volume -1
+JOY_BTN0 cycle pause
+JOY_BTN1 cycle osd
+JOY_BTN2 add volume 1
+JOY_BTN3 add volume -1
 
 #
 # Not assigned by default
 # (not an exhaustive list of unbound commands)
 #
 
-#? sub_scale +0.1                       # increase subtitle font size
-#? sub_scale -0.1                       # decrease subtitle font size
+#? add sub-scale +0.1                   # increase subtitle font size
+#? add sub-scale -0.1                   # decrease subtitle font size
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;