Release 0.2.1

Crashed, instead of disabling auto-repeat.

DOCS/man/en/options.rst

@@ -2108,7 +2108,7 @@ OPTIONS
 ``--stop-screensaver``, ``--no-stop-screensaver``
     Turns off the screensaver (or screen blanker and similar mechanisms) at
     startup and turns it on again on exit (default: yes). The screensaver is
-    always reenabled when the player is paused.
+    always re-enabled when the player is paused.
 
     This is not supported on all video outputs or platforms. Sometimes it is
     implemented, but does not work (happens often on GNOME). You might be able

DOCS/man/en/vo.rst

@@ -776,4 +776,4 @@ Available video output drivers are:
 
     ``alpha``
         Use a buffer format that supports videos and images with alpha
-        informations
+        information

VERSION

@@ -0,0 +1 @@
+0.2.1

audio/filter/af_lavrresample.c

@@ -41,6 +41,7 @@
 #define avresample_alloc_context swr_alloc
 #define avresample_open swr_init
 #define avresample_close(x) do { } while(0)
+#define avresample_free swr_free
 #define avresample_available(x) 0
 #define avresample_convert(ctx, out, out_planesize, out_samples, in, in_planesize, in_samples) \
     swr_convert(ctx, out, out_samples, (const uint8_t**)(in), in_samples)
@@ -275,8 +276,10 @@ static void uninit(struct af_instance *af)
     struct af_resample *s = af->priv;
     if (s->avrctx)
         avresample_close(s->avrctx);
+    avresample_free(&s->avrctx);
     if (s->avrctx_out)
         avresample_close(s->avrctx_out);
+    avresample_free(&s->avrctx_out);
 }
 
 static bool needs_reorder(int *reorder, int num_ch)

etc/mpv.desktop

@@ -3,6 +3,7 @@ Type=Application
 Name=mpv Media Player
 Name[ca]=Reproductor multimèdia mpv
 Name[pl]=mpv odtwarzacz multimedialny
+Name[ru]=Проигрыватель mpv
 GenericName=Multimedia player
 Comment=Play movies and songs
 Comment[ca]=Reproduïu vídeos i cançons
@@ -10,8 +11,9 @@ Comment[de]=Filme und Musik abspielen
 Comment[es]=Reproduzca vídeos y canciones
 Comment[fr]=Lecteur multimédia
 Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
 Comment[pl]=Odtwarzaj filmy i muzykę
+Comment[ru]=Воспроизвести фильмы и музыку
+Comment[zh]=多媒体播放器
 Icon=mpv
 TryExec=mpv
 Exec=mpv --really-quiet --force-window -- %F

mpvcore/input/input.c

@@ -1783,7 +1783,7 @@ static void input_wait_read(struct input_ctx *ictx, int time)
  */
 static void read_events(struct input_ctx *ictx, int time)
 {
-    if (ictx->num_key_down) {
+    if (ictx->num_key_down && ictx->ar_rate > 0) {
         time = FFMIN(time, 1000 / ictx->ar_rate);
         time = FFMIN(time, ictx->ar_delay);
     }

mpvcore/lua/osc.lua

@@ -52,7 +52,7 @@ local osc_styles = {
 
 -- internal states, do not touch
 local state = {
-    showtime,                               -- time of last invokation (last mouse move)
+    showtime,                               -- time of last invocation (last mouse move)
     osc_visible = false,
     anistart,                               -- time when the animation started
     anitype,                                -- current type of animation
@@ -636,7 +636,7 @@ function osc_init()
     -- kill old Elements
     elements = {}
 
-    -- set canvas resolution acording to display aspect and scaling setting
+    -- set canvas resolution according to display aspect and scaling setting
     local baseResY = 720
     local display_w, display_h, display_aspect = mp.get_screen_size()
     local scale = 1
@@ -999,7 +999,7 @@ end
 
 function show_osc()
 
-    --remember last time of invokation (mouse move)
+    --remember last time of invocation (mouse move)
     state.showtime = mp.get_timer()
 
     state.osc_visible = true

video/decode/vdpau_old.c

@@ -257,6 +257,7 @@ static struct mp_image *process_image(struct lavc_ctx *ctx, struct mp_image *img
 }
 
 const struct vd_lavc_hwdec mp_vd_lavc_vdpau_old = {
+    .type = HWDEC_VDPAU,
     .image_formats = (const int[]) {
         IMGFMT_VDPAU_MPEG1, IMGFMT_VDPAU_MPEG2, IMGFMT_VDPAU_H264,
         IMGFMT_VDPAU_WMV3, IMGFMT_VDPAU_VC1, IMGFMT_VDPAU_MPEG4,

video/filter/vf_scale.c

@@ -361,7 +361,7 @@ static int control(struct vf_instance *vf, int request, void *data)
             break;
         return CONTROL_TRUE;
     case VFCTRL_SET_EQUALIZER:
-        if (mp_sws_get_vf_equalizer(sws, data) < 1)
+        if (mp_sws_set_vf_equalizer(sws, data) < 1)
             break;
         return CONTROL_TRUE;
     default:

video/out/wayland_common.c

@@ -313,6 +313,9 @@ static void pointer_handle_enter(void *data,
     wl->cursor.serial = serial;
     wl->cursor.pointer = pointer;
 
+    /* Release the left button on pointer enter again
+     * because after moving the shell surface no release event is sent */
+    mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 | MP_KEY_STATE_UP);
     show_cursor(wl);
 }
 
@@ -334,9 +337,11 @@ static void pointer_handle_motion(void *data,
     struct vo_wayland_state *wl = data;
 
     wl->cursor.pointer = pointer;
+    wl->window.surf_x = wl_fixed_to_int(sx_w);
+    wl->window.surf_y = wl_fixed_to_int(sy_w);
 
-    vo_mouse_movement(wl->vo, wl_fixed_to_int(sx_w),
-                              wl_fixed_to_int(sy_w));
+    vo_mouse_movement(wl->vo, wl->window.surf_x,
+                              wl->window.surf_y);
 }
 
 static void pointer_handle_button(void *data,
@@ -351,6 +356,10 @@ static void pointer_handle_button(void *data,
     mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 + (button - BTN_LEFT) |
                     ((state == WL_POINTER_BUTTON_STATE_PRESSED)
                     ? MP_KEY_STATE_DOWN : MP_KEY_STATE_UP));
+
+    if (!mp_input_test_dragging(wl->vo->input_ctx, wl->window.surf_x, wl->window.surf_y) &&
+        (button == BTN_LEFT) && (state == WL_POINTER_BUTTON_STATE_PRESSED))
+        wl_shell_surface_move(wl->window.shell_surface, wl->input.seat, serial);
 }
 
 static void pointer_handle_axis(void *data,

video/out/wayland_common.h

@@ -71,6 +71,8 @@ struct vo_wayland_state {
         float aspect;
 
         struct wl_surface *surface;
+        int32_t surf_x;
+        int32_t surf_y;
         struct wl_shell_surface *shell_surface;
         int events; /* mplayer events (VO_EVENT_RESIZE) */
     } window;

video/sws_utils.c

@@ -24,6 +24,7 @@
 
 #include "sws_utils.h"
 
+#include "mpvcore/mp_common.h"
 #include "video/mp_image.h"
 #include "video/img_format.h"
 #include "fmt-conversion.h"
@@ -327,7 +328,7 @@ int mp_sws_set_vf_equalizer(struct mp_sws_context *sws, struct vf_seteq *eq)
     if (!strcmp(eq->item, "brightness"))
         sws->brightness = ((eq->value << 16) + 50) / 100;
     else if (!strcmp(eq->item, "contrast"))
-        sws->contrast   = (((eq->value + 100) << 16) + 50) / 100;
+        sws->contrast   = MPMAX(1, (((eq->value + 100) << 16) + 50) / 100);
     else if (!strcmp(eq->item, "saturation"))
         sws->saturation = (((eq->value + 100) << 16) + 50) / 100;
     else