Release 0.2.3

There's no reason why we should e.g. handle SIGQUIT, but not SIGTERM.

Note that sending SIGTERM twice still kills the player.

DOCS/man/en/options.rst

@@ -1420,7 +1420,7 @@ OPTIONS
     chapter order specified for the main file.
 
 ``--osc``, ``--no-osc``
-    Whether to load the on-screen-controller (default: no).
+    Whether to load the on-screen-controller (default: yes).
 
 ``--no-osd-bar``, ``--osd-bar``
     Disable display of the OSD bar. This will make some things (like seeking)

TOOLS/mpv_identify.sh

@@ -104,7 +104,7 @@ for __midentify__key in $__midentify__allprops; do
     eval unset $__midentify__nextprefix$__midentify__key
 done
 
-__midentify__output=`$MPV --playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=1 --quiet "$@"`
+__midentify__output=`$MPV --playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=1 --quiet --no-cache --no-config "$@"`
 __midentify__fileindex=0
 __midentify__prefix=
 while :; do

VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

audio/fmt-conversion.c

@@ -43,7 +43,7 @@ enum AVSampleFormat af_to_avformat(int fmt)
         if (audio_conversion_map[i].fmt == fmt)
             break;
     sample_fmt = audio_conversion_map[i].sample_fmt;
-    if (sample_fmt == AF_FORMAT_UNKNOWN)
+    if (sample_fmt == AV_SAMPLE_FMT_NONE)
         mp_msg(MSGT_GLOBAL, MSGL_V, "Unsupported sample format: %s\n",
                 af_fmt2str_short(fmt));
     return sample_fmt;

etc/input.conf

@@ -31,9 +31,13 @@
 # file to ~/.mpv/input.conf, and uncomment and edit the binding you want to
 # change.
 
-# Developer note: this file is baked into the mpv binary, and internally,
-# entries are uncommented and added as default bindings. Lines that have a
-# space after the '#' are ignored.
+# Developer note:
+# etc/input.conf from the mpv source tree is baked into the mpv binary, with
+# all entries magically uncommented and parsed on initialization. This, this
+# file defines the mpv default key bindings. If this file is read as normal
+# config file, all lines starting with '#' are treated as comments (and this
+# file, if unedited, doesn't define any bindings).
+# Lines that have a space after the '#' are always ignored as real comments.
 
 #MOUSE_BTN0 ignore                      # don't do anything
 #MOUSE_BTN0_DBL cycle fullscreen        # toggle fullscreen on/off

mpvcore/mplayer.c

@@ -4355,8 +4355,9 @@ static void stream_dump(struct MPContext *mpctx)
 // from the given playlist pl, so the entries don't actually need to be copied.
 static void transfer_playlist(struct MPContext *mpctx, struct playlist *pl)
 {
-    if (mpctx->demuxer->playlist->first) {
-        playlist_transfer_entries(mpctx->playlist, mpctx->demuxer->playlist);
+    if (pl->first) {
+        playlist_transfer_entries(mpctx->playlist, pl);
+        // current entry is replaced
         if (mpctx->playlist->current)
             playlist_remove(mpctx->playlist, mpctx->playlist->current);
     } else {

osdep/getch2.c

@@ -561,6 +561,7 @@ void getch2_enable(void){
     setsigaction(SIGTSTP, stop_sighandler, SA_RESETHAND, false);
     setsigaction(SIGINT,  quit_request_sighandler, SA_RESETHAND, false);
     setsigaction(SIGQUIT, quit_request_sighandler, SA_RESETHAND, false);
+    setsigaction(SIGTERM, quit_request_sighandler, SA_RESETHAND, false);
     setsigaction(SIGTTIN, SIG_IGN, 0, true);
 
     do_activate_getch2();
@@ -577,6 +578,7 @@ void getch2_disable(void){
     setsigaction(SIGTSTP, SIG_DFL, 0, false);
     setsigaction(SIGINT,  SIG_DFL, 0, false);
     setsigaction(SIGQUIT, SIG_DFL, 0, false);
+    setsigaction(SIGTERM, SIG_DFL, 0, false);
     setsigaction(SIGTTIN, SIG_DFL, 0, false);
 
     do_deactivate_getch2();

stream/stream.c

@@ -387,6 +387,8 @@ static int stream_reconnect(stream_t *s)
 #define RECONNECT_SLEEP_MS 1000
     if (!s->streaming)
         return 0;
+    if (!s->end_pos || !s->seek || !(s->flags & MP_STREAM_SEEK))
+        return 0;
     int64_t pos = s->pos;
     for (int retry = 0; retry < MAX_RECONNECT_RETRIES; retry++) {
         mp_msg(MSGT_STREAM, MSGL_WARN,

stream/stream_lavf.c

@@ -316,6 +316,8 @@ const stream_info_t stream_info_ffmpeg = {
   .open = open_f,
   .protocols = (const char*[]){
      "lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", "mms", "mmst", "mmsh",
-     "mmshttp", "udp", "ftp", "rtp", "httpproxy",
+     "mmshttp", "udp", "ftp", "rtp", "httpproxy", "hls", "rtmpe", "rtmps",
+     "rtmpt", "rtmpte", "rtmpts", "srtp", "tcp", "udp", "tls", "unix", "sftp",
+     "md5",
      NULL },
 };

video/out/gl_video.c

@@ -47,11 +47,11 @@ static const char vo_opengl_shaders[] =
 // Pixel width of 1D lookup textures.
 #define LOOKUP_TEXTURE_SIZE 256
 
-// Texture units 0-2 are used by the video, with unit 0 for free use.
-// Units 3-4 are used for scaler LUTs.
-#define TEXUNIT_SCALERS 3
-#define TEXUNIT_3DLUT 5
-#define TEXUNIT_DITHER 6
+// Texture units 0-3 are used by the video, with unit 0 for free use.
+// Units 4-5 are used for scaler LUTs.
+#define TEXUNIT_SCALERS 4
+#define TEXUNIT_3DLUT 6
+#define TEXUNIT_DITHER 7
 
 // lscale/cscale arguments that map directly to shader filter routines.
 // Note that the convolution filters are not included in this list.