[SCM] mpv/master: Imported Upstream version 0.1.4

[ghedo at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 86bf6d20c5829dbf5e1bbc1007ebc935a5895e36
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Mon Sep 2 13:05:03 2013 +0200

    Imported Upstream version 0.1.4

diff --git a/VERSION b/VERSION
index b1e80bb..845639e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/configure b/configure
index 25d7559..fec2dd0 100755
--- a/configure
+++ b/configure
@@ -316,7 +316,7 @@ Optional features:
   --disable-bluray       disable Blu-ray support [autodetect]
   --disable-dvdread      disable libdvdread [autodetect]
   --disable-enca         disable ENCA charset oracle library [autodetect]
-  --enable-macosx-bundle enable Mac OS X bundle file locations [autodetect]
+  --enable-macosx-bundle enable Mac OS X bundle file locations [disabled]
   --disable-pthreads     disable Posix threads support [autodetect]
   --disable-libass       disable subtitle rendering with libass [autodetect]
   --disable-libass-osd   disable OSD rendering with libass [autodetect]
@@ -474,7 +474,7 @@ _cdda=auto
 _coreaudio=auto
 _corevideo=auto
 _cocoa=auto
-_macosx_bundle=auto
+_macosx_bundle=no
 _enca=auto
 _pthreads=auto
 _ass=auto
@@ -709,7 +709,6 @@ for ac_option do
   --enable-cocoa) _cocoa=yes ;;
   --disable-cocoa) _cocoa=no ;;
   --enable-macosx-bundle) _macosx_bundle=yes ;;
-  --disable-macosx-bundle) _macosx_bundle=no ;;
 
   --enable-manpage) _build_man=yes ;;
   --disable-manpage) _build_man=no ;;
@@ -1550,11 +1549,11 @@ echores "$_sys_sysinfo"
 if darwin; then
 
 echocheck "Mac OS X Bundle file locations"
-def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
-test "$_macosx_bundle" = auto
 if test "$_macosx_bundle" = yes ; then
   extra_ldflags="$extra_ldflags -headerpad_max_install_names"
   def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
+else
+  def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
 fi
 echores "$_macosx_bundle"
 
diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c
index f900b74..8ba456d 100644
--- a/mpvcore/input/input.c
+++ b/mpvcore/input/input.c
@@ -1269,6 +1269,8 @@ static struct cmd_bind *find_any_bind_for_key(struct input_ctx *ictx,
         struct active_section *s = &ictx->active_sections[i];
         struct cmd_bind *bind = find_bind_for_key_section(ictx, s->name, n, keys);
         if (bind) {
+            if (bind->is_builtin && !ictx->default_bindings)
+                goto skip;
             struct cmd_bind_section *bs = bind->owner;
             for (int x = 0; x < n; x++) {
                 if (MP_KEY_DEPENDS_ON_MOUSE_POS(keys[x]) && bs->mouse_area_set &&
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 0a1ae17..13e1286 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -657,7 +657,11 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
             NSApplicationPresentationDefault;
 
         if ([s->fs_screen hasMenubar])
-            popts |= NSApplicationPresentationAutoHideMenuBar;
+            // Cocoa raises an exception when autohiding the menubar but
+            // not the dock. They probably got bored while programming the
+            // multi screen support and took some shortcuts (tested on 10.8).
+            popts |= NSApplicationPresentationAutoHideMenuBar |
+                     NSApplicationPresentationAutoHideDock;
 
         if ([s->fs_screen hasDock])
             popts |= NSApplicationPresentationAutoHideDock;
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 6fb41e5..719c06d 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -433,7 +433,6 @@ static bool fbotex_init(struct gl_video *p, struct fbotex *fbo, int w, int h,
     GL *gl = p->gl;
     bool res = true;
 
-    assert(gl->mpgl_caps & MPGL_CAP_FB);
     assert(!fbo->fbo);
     assert(!fbo->texture);
 
@@ -446,6 +445,9 @@ static bool fbotex_init(struct gl_video *p, struct fbotex *fbo, int w, int h,
 
     MP_VERBOSE(p, "Create FBO: %dx%d\n", fbo->tex_w, fbo->tex_h);
 
+    if (!(gl->mpgl_caps & MPGL_CAP_FB))
+        return false;
+
     gl->GenFramebuffers(1, &fbo->fbo);
     gl->GenTextures(1, &fbo->texture);
     gl->BindTexture(GL_TEXTURE_2D, fbo->texture);
@@ -1499,6 +1501,10 @@ static bool get_image(struct gl_video *p, struct mp_image *mpi)
 
     struct video_image *vimg = &p->image;
 
+    // See comments in init_video() about odd video sizes.
+    // The normal upload path does this too, but less explicit.
+    mp_image_set_size(mpi, vimg->planes[0].w, vimg->planes[0].h);
+
     for (int n = 0; n < p->plane_count; n++) {
         struct texplane *plane = &vimg->planes[n];
         mpi->stride[n] = mpi->plane_w[n] * p->image_desc.bytes[n];
@@ -1709,10 +1715,10 @@ static void check_gl_features(struct gl_video *p)
     }
 
     // fruit dithering mode and the 3D lut use this texture format
-    if ((p->opts.dither_depth >= 0 && p->opts.dither_algo == 0) ||
-        p->use_lut_3d)
+    if (have_fbo && ((p->opts.dither_depth >= 0 && p->opts.dither_algo == 0) ||
+                     p->use_lut_3d))
     {
-        // doesn't disalbe anything; it's just for the log
+        // doesn't disable anything; it's just for the log
         MP_VERBOSE(p, "Testing GL_R16 FBO (dithering/LUT)\n");
         test_fbo(p, GL_R16);
     }

-- 
mpv packaging