Release 0.3.7

There wasn't any reason for this. In fact, it's a memory leak. The
proper priv struct is already allocated vf.c and the option parser.

DOCS/coding-style.md

@@ -0,0 +1,139 @@
+Coding style
+============
+
+mpv uses C99 with K&R formatting, with some exceptions.
+
+General formatting
+------------------
+
+- Use the K&R indent style.
+- Use 4 spaces of indentation, never use tabs (except in Makefiles).
+- Add a single space between keywords and binary operators. There are some other
+  cases where spaces should be added. Example:
+
+    ```C
+    if ((a * b) > c) {
+        // code
+        some_function(a, b, c);
+    }
+    ```
+- Break lines on 80 columns. There is a hard limit of 85 columns. You may ignore
+  this limit if there's a strong case that not breaking the line will increase
+  readability. Going over 85 columns might provoke endless discussions about
+  whether such a limit is needed or not, so avoid it.
+- If the body of an if/for/while statement has more than 1 physical lines, then
+  always add braces, even if they're technically redundant.
+
+  Bad:
+
+    ```C
+    if (a)
+        // do something if b
+        if (b)
+            do_something();
+    ```
+
+  Good:
+
+    ```C
+    if (a) {
+        // do something if b
+        if (b)
+            do_something();
+    }
+    ```
+- If the body of an if statement uses braces, the else branch should also
+  use braces (and reverse).
+
+  Example:
+
+    ```C
+    if (a) {
+        // do something
+        something();
+        something_else();
+    } else {
+        one_line();
+    }
+    ```
+- If an if condition spans multiple physical lines, then put the opening brace
+  for the if body on the next physical line. (Also, preferably always add a
+  brace, even if technically none is needed.)
+
+  Example:
+
+    ```C
+    if (very_long_condition_a &&
+        very_long_condition_b)
+    {
+        code();
+    }
+    ```
+- Remove any trailing whitespace.
+- If the file you're editing uses formatting different from from what is
+  described here, it's probably an old file from times when nobody followed a
+  consistent style. You're free to use the existing style, or the new style, or
+  to send a patch to reformat the file to the new style before making functional
+  changes.
+
+General coding
+--------------
+
+- Use C99. Also freely make use of C99 features if it's appropriate, such as
+  stdbool.h.
+- Don't use GNU-only features. In some cases they may be warranted, if they
+  are optional (such as attributes enabling printf-like format string checks).
+  But in general, standard C99 should be used.
+- The same applies to libc functions. We have to be Windows-compatible too. Use
+  functions guaranteed by C99 or POSIX only, unless your use is guarded by a
+  configure check.
+- Prefer fusing declaration and initialization, rather than putting declarations
+  on the top of a block. Obvious data flow is more important than avoiding
+  mixing declarations and statements, which is just a C90 artifact.
+- tech-overview.txt might help to get an overview how mpv is structured.
+- If you add features that require intrusive changes, discuss them on the dev
+  channel first. There might be a better way to add a feature and it can avoid
+  wasted work.
+
+Sending patches
+---------------
+
+- Make a github pull request, or send a link to a plaintext patch created with
+  ``git format-patch``. diffs posted as pastebins (especially if the http link
+  returns HTML) just cause extra work for everyone, because they lack commit
+  message and authorship information.
+- Write informative commit messages. Use present tense to describe the
+  situation with the patch applied, and past tense for the situation before
+  the change.
+- The subject line (the first line in a commit message) should contain a
+  prefix identifying the sub system, followed by a short description what
+  impact this commit has. This subject line shouldn't be longer than 72
+  characters, because it messes up the output of many git tools otherwise.
+
+  For example, you fixed a crash in af_volume.c:
+
+  Bad: ``fixed the bug (wtf?)``
+  Good: ``af_volume: fix crash due to null pointer access``
+
+  Having a prefix gives context, and is especially useful when trying to find
+  a specific change by looking at the history, or when running ``git blame``.
+- The body of the commit message (everything else after the subject line) should
+  be as informative as possible and contain everything that isn't obvious. Don't
+  hesitate to dump as much information as you can - it doesn't cost you
+  anything. Put some effort into it. If someone finds a bug months or years
+  later, and finds that it's caused by your commit (even though your commit was
+  supposed to fix another bug), it would be bad if there wasn't enough
+  information to test the original bug. The old bug might be reintroduced while
+  fixing the new bug.
+
+  The commit message should be wrapped on 72 characters per line, because git
+  tools usually do not break text automatically. On the other hand, you do not
+  need to break text that would be unnatural to break (like data for test cases,
+  or long URLs).
+
+  Important: put an empty line between the subject line and the commit message.
+  If this is missing, it will break display in common git tools.
+- Try to separate cosmetic and functional changes. It's ok to make a few
+  additional cosmetic changes in the same file you're working on, but don't do
+  something like reformatting a whole file and hiding an actual functional
+  change in the same commit.

DOCS/man/en/af.rst

@@ -266,7 +266,7 @@ Available filters are:
     Filter for internal use only. Converts between signed/unsigned formats
     and formats with different endian.
 
-``volume[=volumedb[:softclip[:s16]]]``
+``volume[=<volumedb>[:...]]``
     Implements software volume control. Use this filter with caution since it
     can reduce the signal to noise ratio of the sound. In most cases it is
     best to use the *Master* volume control of your sound card or the volume
@@ -279,14 +279,14 @@ Available filters are:
         Sets the desired gain in dB for all channels in the stream from -200dB
         to +60dB, where -200dB mutes the sound completely and +60dB equals a
         gain of 1000 (default: 0).
-    ``<softclip>``
+    ``softclip``
         Turns soft clipping on. Soft-clipping can make the
         sound more smooth if very high volume levels are used. Enable this
         option if the dynamic range of the loudspeakers is very low.
 
         *WARNING*: This feature creates distortion and should be considered a
         last resort.
-    ``<s16>``
+    ``s16``
         Force S16 sample format if set. Lower quality, but might be faster
         in some situations.
 
@@ -296,7 +296,7 @@ Available filters are:
             Would amplify the sound by 10.1dB and hard-clip if the sound level
             is too high.
 
-``pan=n[:<matrix>]``
+``pan=n:[<matrix>]``
     Mixes channels arbitrarily. Basically a combination of the volume and the
     channels filter that can be used to down-mix many channels to only a few,
     e.g. stereo to mono, or vary the "width" of the center speaker in a

DOCS/man/en/options.rst

@@ -1152,7 +1152,9 @@ OPTIONS
     You can get the list of allowed codecs with ``mpv --vd=help``. Remove the
     prefix, e.g. instead of ``lavc:h264`` use ``h264``.
 
-    By default this is set to ``h264,vc1,wmv3``.
+    By default this is set to ``h264,vc1,wmv3``. Note that the hardware
+    acceleration special codecs like ``h264_vdpau`` are not relevant anymore,
+    and in fact have been removed from Libav in this form.
 
     This is usually only needed with broken GPUs, where a codec is reported
     as supported, but decoding causes more problems than it solves.
@@ -1780,7 +1782,7 @@ OPTIONS
     libquvi 0.9.x:
 
         The following explanations are relevant:
-        `<http://quvi.sourceforge.net/doc/0.9/glossary_termino.html#m_stream_id>`_
+        `<http://quvi.sourceforge.net/r/api/0.9/glossary_termino.html#m_stream_id>`_
 
     The ``quvi-format`` property can be used at runtime to cycle through the
     list of formats. Unfortunately, this is slow. On libquvi 0.4.x, this

README.md

@@ -45,13 +45,22 @@ Essential dependencies (incomplete list):
 - gcc or clang
 - X development headers (xlib, X extensions, libvdpau, libGL, libXv, ...)
 - Audio output development headers (libasound, pulseaudio)
-- fribidi, freetype, fontconfig development headers (for libass)
-- libass
-- FFmpeg libraries (libavutil libavcodec libavformat libswscale libpostproc)
-- libjpeg
+- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavresample)
+- libjpeg (for screenshots)
 - libquvi if you want to play Youtube videos directly
+
+Libass dependencies:
+
+- gcc or clang, yasm on x86 and x86_64
+- fribidi, freetype, fontconfig development headers (for libass)
+
+FFmpeg dependencies:
+
+- gcc or clang, yasm on x86 and x86_64
+- OpenSSL (has to be explicitly enabled when compiling ffmpeg)
 - libx264/libmp3lame/libfdk-aac if you want to use encoding (has to be
   explicitly enabled when compiling ffmpeg)
+- Libav also works, but some features will not work. (See section below.)
 
 Most of the above libraries are available in suitable versions on normal
 Linux distributions. However FFmpeg is an exception (distro versions may be

VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

audio/chmap.c

@@ -485,5 +485,5 @@ void mp_chmap_print_help(struct mp_log *log)
                  std_layout_names[n][0], std_layout_names[n][1]);
     }
     for (int n = 0; n < MP_NUM_CHANNELS; n++)
-        mp_info(log, "    unknown%d\n", n);
+        mp_info(log, "    unknown%d\n", n + 1);
 }

old-makefile

@@ -27,8 +27,7 @@ SOURCES_AUDIO_INPUT-$(ALSA)     += stream/ai_alsa1x.c
 SOURCES_AUDIO_INPUT-$(OSS)      += stream/ai_oss.c
 SOURCES_AUDIO_INPUT-$(SNDIO)    += stream/ai_sndio.c
 SOURCES-$(AUDIO_INPUT)          += $(SOURCES_AUDIO_INPUT-yes)
-SOURCES-$(CDDA)                 += stream/stream_cdda.c \
-                                   stream/cdinfo.c
+SOURCES-$(CDDA)                 += stream/stream_cdda.c
 SOURCES-$(DVBIN)                += stream/dvb_tune.c \
                                    stream/stream_dvb.c
 SOURCES-$(DVDREAD)              += stream/stream_dvd.c \

player/command.c

@@ -750,11 +750,9 @@ static int mp_property_chapter_metadata(m_option_t *prop, int action, void *arg,
 {
     struct demuxer *demuxer = mpctx->master_demuxer;
     int chapter = get_current_chapter(mpctx);
-    if (!demuxer || chapter < 0)
+    if (!demuxer || chapter < 0 || chapter >= demuxer->num_chapters)
         return M_PROPERTY_UNAVAILABLE;
 
-    assert(chapter < demuxer->num_chapters);
-
     return tag_property(prop, action, arg, demuxer->chapters[chapter].metadata);
 }
 

player/dvdnav.c

@@ -140,7 +140,10 @@ void mp_handle_nav(struct MPContext *mpctx)
         case MP_NAV_EVENT_RESET_ALL: {
             mpctx->stop_play = PT_RELOAD_DEMUXER;
             MP_VERBOSE(nav, "reload\n");
-            break;
+            // return immediately.
+            // other events should be handled after reloaded.
+            talloc_free(ev);
+            return;
         }
         case MP_NAV_EVENT_RESET: {
             nav->nav_still_frame = 0;
@@ -237,6 +240,8 @@ void mp_nav_get_highlight(struct osd_state *osd, struct mp_osd_res res,
         talloc_free(sub->bitmap);
         sub->bitmap = talloc_array(sub, uint32_t, sizes[0] * sizes[1]);
         memset(sub->bitmap, 0x80, talloc_get_size(sub->bitmap));
+        nav->subsize[0] = sizes[0];
+        nav->subsize[1] = sizes[1];
     }
 
     sub->x = nav->highlight[0];

player/main.c

@@ -64,6 +64,14 @@
 #include "command.h"
 #include "screenshot.h"
 
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#include <windows.h>
+
+#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE
+#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE (0x0001)
+#endif
+#endif
+
 #if HAVE_X11
 #include "video/out/x11_common.h"
 #endif
@@ -76,18 +84,6 @@
 #include <pthread.h>
 #endif
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-#include <windows.h>
-
-#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE
-#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE (0x0001)
-#endif
-
-#ifndef BASE_SEARCH_PATH_PERMANENT
-#define BASE_SEARCH_PATH_PERMANENT (0x8000)
-#endif
-#endif
-
 const char mp_help_text[] =
 "Usage:   mpv [options] [url|path/]filename\n"
 "\n"

player/misc.c

@@ -106,6 +106,10 @@ double get_start_time(struct MPContext *mpctx)
     struct demuxer *demuxer = mpctx->demuxer;
     if (!demuxer)
         return 0;
+    // We reload the demuxer on menu transitions; don't make it use the first
+    // timestamp it finds as start PTS.
+    if (mpctx->nav_state)
+        return 0;
     return demuxer_get_start_time(demuxer);
 }
 

player/playloop.c

@@ -66,7 +66,7 @@ static const char av_desync_help_text[] =
 "     Experiment with different values for --autosync, 30 is a good start.\n"
 "     If you have PulseAudio, try --ao=alsa .\n"
 "- Slow video output.\n"
-"     Try a different -vo driver (-vo help for a list) or try -framedrop!\n"
+"     Try a different --vo driver (--vo=help for a list) or try --framedrop!\n"
 "- Playing a video file with --vo=opengl with higher FPS than the monitor.\n"
 "     This is due to vsync limiting the framerate.\n"
 "- Playing from a slow network source.\n"

stream/cdd.h

@@ -1,58 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_CDD_H
-#define MPLAYER_CDD_H
-
-#include <sys/types.h>
-
-struct mp_log;
-
-typedef struct cd_track {
-	char *name;
-	unsigned int track_nb;
-	unsigned int min;
-	unsigned int sec;
-	unsigned int msec;
-	unsigned long frame_begin;
-	unsigned long frame_length;
-	struct cd_track *prev;
-	struct cd_track *next;
-} cd_track_t;
-
-typedef struct {
-	char *artist;
-	char *album;
-	char *genre;
-	unsigned int nb_tracks;
-	unsigned int min;
-	unsigned int sec;
-	unsigned msec;
-	cd_track_t *first;
-	cd_track_t *last;
-	cd_track_t *current;
-} cd_info_t;
-
-cd_info_t* 	cd_info_new(void);
-void		cd_info_free(cd_info_t *cd_info);
-cd_track_t*	cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, unsigned int min, unsigned int sec, unsigned int msec, unsigned long frame_begin, unsigned long frame_length);
-cd_track_t*	cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb);
-
-void cd_info_debug(cd_info_t *cd_info, struct mp_log *log);
-
-#endif /* MPLAYER_CDD_H */

stream/cdinfo.c

@@ -1,154 +0,0 @@
-/*
- * CD Info
- *
- * Copyright (C) 2002 Bertrand Baudet <bertrand_baudet@yahoo.com>
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "common/msg.h"
-#include "cdd.h"
-
-/*******************************************************************************************************************
- *
- * xmcd parser, cd info list
- *
- *******************************************************************************************************************/
-
-cd_info_t*
-cd_info_new(void) {
-	cd_info_t *cd_info = NULL;
-
-	cd_info = malloc(sizeof(cd_info_t));
-	if( cd_info==NULL ) {
-		return NULL;
-	}
-
-	memset(cd_info, 0, sizeof(cd_info_t));
-
-	return cd_info;
-}
-
-void
-cd_info_free(cd_info_t *cd_info) {
-	cd_track_t *cd_track, *cd_track_next;
-	if( cd_info==NULL ) return;
-	free(cd_info->artist);
-	free(cd_info->album);
-	free(cd_info->genre);
-
-	cd_track_next = cd_info->first;
-	while( cd_track_next!=NULL ) {
-		cd_track = cd_track_next;
-		cd_track_next = cd_track->next;
-		free(cd_track->name);
-		free(cd_track);
-	}
-}
-
-cd_track_t*
-cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, unsigned int min, unsigned int sec, unsigned int msec, unsigned long frame_begin, unsigned long frame_length) {
-	cd_track_t *cd_track;
-
-	if( cd_info==NULL || track_name==NULL ) return NULL;
-
-	cd_track = malloc(sizeof(cd_track_t));
-	if( cd_track==NULL ) {
-		return NULL;
-	}
-	memset(cd_track, 0, sizeof(cd_track_t));
-
-	cd_track->name = malloc(strlen(track_name)+1);
-	if( cd_track->name==NULL ) {
-		free(cd_track);
-		return NULL;
-	}
-	strcpy(cd_track->name, track_name);
-	cd_track->track_nb = track_nb;
-	cd_track->min = min;
-	cd_track->sec = sec;
-	cd_track->msec = msec;
-	cd_track->frame_begin = frame_begin;
-	cd_track->frame_length = frame_length;
-
-	if( cd_info->first==NULL ) {
-		cd_info->first = cd_track;
-	}
-	if( cd_info->last!=NULL ) {
-		cd_info->last->next = cd_track;
-	}
-
-	cd_track->prev = cd_info->last;
-
-	cd_info->last = cd_track;
-	cd_info->current = cd_track;
-
-	cd_info->nb_tracks++;
-
-	return cd_track;
-}
-
-cd_track_t*
-cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb) {
-	cd_track_t *cd_track=NULL;
-
-	if( cd_info==NULL ) return NULL;
-
-	cd_track = cd_info->first;
-	while( cd_track!=NULL ) {
-		if( cd_track->track_nb==track_nb ) {
-			return cd_track;
-		}
-		cd_track = cd_track->next;
-	}
-	return NULL;
-}
-
-void cd_info_debug(cd_info_t *cd_info, struct mp_log *log)
-{
-	cd_track_t *current_track;
-	mp_info(log, "================ CD INFO === start =========\n");
-	if( cd_info==NULL ) {
-		mp_info(log, "cd_info is NULL\n");
-		return;
-	}
-	mp_info(log, " artist=[%s]\n", cd_info->artist);
-	mp_info(log, " album=[%s]\n", cd_info->album);
-	mp_info(log, " genre=[%s]\n", cd_info->genre);
-	mp_info(log, " nb_tracks=%d\n", cd_info->nb_tracks);
-	mp_info(log, " length= %2d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec);
-
-	mp_info(log, "ID_CDDB_INFO_ARTIST=%s\n", cd_info->artist);
-	mp_info(log, "ID_CDDB_INFO_ALBUM=%s\n", cd_info->album);
-	mp_info(log, "ID_CDDB_INFO_GENRE=%s\n", cd_info->genre);
-	mp_info(log, "ID_CDDB_INFO_LENGTH_MSF=%02d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec);
-	mp_info(log, "ID_CDDB_INFO_TRACKS=%d\n", cd_info->nb_tracks);
-
-	current_track = cd_info->first;
-	while( current_track!=NULL ) {
-		mp_info(log, "  #%2d %2d:%02d.%02d @ %7ld\t[%s] \n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec, current_track->frame_begin, current_track->name);
-		mp_info(log, "ID_CDDB_INFO_TRACK_%d_NAME=%s\n", current_track->track_nb, current_track->name);
-		mp_info(log, "ID_CDDB_INFO_TRACK_%d_MSF=%02d:%02d.%02d\n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec);
-		current_track = current_track->next;
-	}
-	mp_info(log, "================ CD INFO ===  end  =========\n");
-}

stream/stream_bluray.c

@@ -187,6 +187,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
             return STREAM_UNSUPPORTED;
 
         *((double *) arg) = BD_TIME_TO_MP(ti->duration);
+        bd_free_title_info(ti);
         return STREAM_OK;
     }
 

stream/stream_cdda.c

@@ -46,8 +46,6 @@
 #include "libavutil/common.h"
 #include "compat/mpbswap.h"
 
-#include "cdd.h"
-
 #include "common/msg.h"
 
 typedef struct {
@@ -56,7 +54,6 @@ typedef struct {
     int sector;
     int start_sector;
     int end_sector;
-    cd_info_t *cd_info;
 
     // options
     int speed;
@@ -132,8 +129,8 @@ static bool print_cdtext(stream_t *s, int track)
 #else
     cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
 #endif
+    int header = 0;
     if (text) {
-        MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
         for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
             const char *name = cdtext_name[i];
 #ifdef OLD_API
@@ -141,8 +138,12 @@ static bool print_cdtext(stream_t *s, int track)
 #else
             const char *value = cdtext_get_const(text, i, track);
 #endif
-            if (name && value)
+            if (name && value) {
+                if (!header)
+                    MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
+                header = 1;
                 MP_INFO(s, "  %s: '%s'\n", name, value);
+            }
         }
         return true;
     }
@@ -151,17 +152,8 @@ static bool print_cdtext(stream_t *s, int track)
 
 static void print_track_info(stream_t *s, int track)
 {
-    cdda_priv* p = (cdda_priv*)s->priv;
-    cd_track_t *cd_track = cd_info_get_track(p->cd_info, track);
-    if( cd_track!=NULL ) {
-        MP_INFO(s, "\n%s\n", cd_track->name);
-        MP_INFO(s, "ID_CDDA_TRACK=%d\n",
-               cd_track->track_nb);
-    }
-    if (print_cdtext(s, track)) {
-        // hack for term OSD overwriting the last line of CDTEXT
-        MP_INFO(s, "\n");
-    }
+    MP_INFO(s, "Switched to track %d\n", track);
+    print_cdtext(s, track);
 }
 
 static void cdparanoia_callback(long int inpos, paranoia_cb_mode_t function)
@@ -242,7 +234,6 @@ static void close_cdda(stream_t *s)
     cdda_priv *p = (cdda_priv *)s->priv;
     paranoia_free(p->cdp);
     cdda_close(p->cd);
-    cd_info_free(p->cd_info);
     free(p);
 }
 
@@ -273,37 +264,18 @@ static int control(stream_t *stream, int cmd, void *arg)
         *(unsigned int *)arg = end_track + 1 - start_track;
         return STREAM_OK;
     }
-    case STREAM_CTRL_SEEK_TO_CHAPTER:
+    case STREAM_CTRL_GET_CHAPTER_TIME:
     {
-        int r;
-        unsigned int track = *(unsigned int *)arg;
+        int track = *(double *)arg;
         int start_track = get_track_by_sector(p, p->start_sector);
         int end_track = get_track_by_sector(p, p->end_sector);
-        int seek_sector;
-        if (start_track == -1 || end_track == -1)
+        track += start_track + 1;
+        if (track > end_track)
             return STREAM_ERROR;
-        track += start_track;
-        if (track > end_track) {
-            seek(stream, (p->end_sector + 1) * CDIO_CD_FRAMESIZE_RAW);
-            // seeking beyond EOF should not be an error,
-            // the cache cannot handle changing stream pos and
-            // returning error.
-            return STREAM_OK;
-        }
-        seek_sector = track == 0 ? p->start_sector
-                      : p->cd->disc_toc[track].dwStartSector;
-        r = seek(stream, seek_sector * CDIO_CD_FRAMESIZE_RAW);
-        if (r)
-            return STREAM_OK;
-        break;
-    }
-    case STREAM_CTRL_GET_CURRENT_CHAPTER:
-    {
-        int start_track = get_track_by_sector(p, p->start_sector);
-        int cur_track = get_track_by_sector(p, p->sector);
-        if (start_track == -1 || cur_track == -1)
-            return STREAM_ERROR;
-        *(unsigned int *)arg = cur_track - start_track;
+        int64_t sector = p->cd->disc_toc[track].dwStartSector;
+        int64_t pos = sector * (CDIO_CD_FRAMESIZE_RAW + 1) - 1;
+        // Assume standard audio CD: 44.1khz, 2 channels, s16 samples
+        *(double *)arg = pos / (44100.0 * 2 * 2);
         return STREAM_OK;
     }
     }
@@ -317,10 +289,7 @@ static int open_cdda(stream_t *st, int m)
     int mode = p->paranoia_mode;
     int offset = p->toc_offset;
     cdrom_drive_t *cdd = NULL;
-    cd_info_t *cd_info;
-    unsigned int audiolen = 0;
     int last_track;
-    int i;
 
     if (m != STREAM_READ) {
         return STREAM_UNSUPPORTED;
@@ -355,29 +324,9 @@ static int open_cdda(stream_t *st, int m)
         return STREAM_ERROR;
     }
 
-    cd_info = cd_info_new();
-    MP_INFO(st, "Found audio CD with %d tracks.\n",
-            (int)cdda_tracks(cdd));
-    for (i = 0; i < cdd->tracks; i++) {
-        char track_name[80];
-        long sec = cdda_track_firstsector(cdd, i + 1);
-        long off = cdda_track_lastsector(cdd, i + 1) - sec + 1;
-
-        sprintf(track_name, "Track %d", i + 1);
-        cd_info_add_track(cd_info, track_name, i + 1,
-                          (unsigned int)(off / (60 * 75)),
-                          (unsigned int)((off / 75) % 60),
-                          (unsigned int)(off % 75), sec, off);
-        audiolen += off;
-    }
-    cd_info->min  = (unsigned int)(audiolen / (60 * 75));
-    cd_info->sec  = (unsigned int)((audiolen / 75) % 60);
-    cd_info->msec = (unsigned int)(audiolen % 75);
-
     priv = malloc(sizeof(cdda_priv));
     memset(priv, 0, sizeof(cdda_priv));
     priv->cd = cdd;
-    priv->cd_info = cd_info;
 
     if (p->toc_bias)
         offset -= cdda_track_firstsector(cdd, 1);
@@ -411,7 +360,6 @@ static int open_cdda(stream_t *st, int m)
     if (priv->cdp == NULL) {
         cdda_close(cdd);
         free(priv);
-        cd_info_free(cd_info);
         return STREAM_ERROR;
     }
 

stream/stream_dvdnav.c

@@ -298,42 +298,47 @@ static void handle_cmd(stream_t *s, struct mp_nav_cmd *ev)
 
 }
 
+static inline bool set_event_type(struct priv *priv, int type,
+                                  struct mp_nav_event *event)
+{
+    if (!(priv->next_event & (1 << type)))
+        return false;
+    priv->next_event &= ~(1 << type);
+    event->event = type;
+    return true;
+}
+
 static void fill_next_event(stream_t *s, struct mp_nav_event **ret)
 {
     struct priv *priv = s->priv;
     struct mp_nav_event e = {0};
-    for (int n = 0; n < 30; n++) {
-        if (priv->next_event & (1 << n)) {
-            priv->next_event &= ~(1 << n);
-            e.event = n;
-            switch (e.event) {
-            case MP_NAV_EVENT_HIGHLIGHT: {
-                dvdnav_highlight_event_t hlev = priv->hlev;
-                e.u.highlight.display = hlev.display;
-                e.u.highlight.sx = hlev.sx;
-                e.u.highlight.sy = hlev.sy;
-                e.u.highlight.ex = hlev.ex;
-                e.u.highlight.ey = hlev.ey;
-                e.u.highlight.palette = hlev.palette;
-                break;
-            }
-            case MP_NAV_EVENT_MENU_MODE:
-                e.u.menu_mode.enable = !dvdnav_is_domain_vts(priv->dvdnav);
-                break;
-            case MP_NAV_EVENT_STILL_FRAME:
-                e.u.still_frame.seconds = priv->still_length;
-                break;
-            }
-            break;
-        }
+    if (!set_event_type(priv, MP_NAV_EVENT_RESET_ALL, &e))
+        for (int n = 0; n < 30 && !set_event_type(priv, n, &e); n++) ;
+    switch (e.event) {
+    case MP_NAV_EVENT_NONE:
+        return;
+    case MP_NAV_EVENT_HIGHLIGHT: {
+        dvdnav_highlight_event_t hlev = priv->hlev;
+        e.u.highlight.display = hlev.display;
+        e.u.highlight.sx = hlev.sx;
+        e.u.highlight.sy = hlev.sy;
+        e.u.highlight.ex = hlev.ex;
+        e.u.highlight.ey = hlev.ey;
+        e.u.highlight.palette = hlev.palette;
+        break;
     }
-    if (e.event) {
-        *ret = talloc(NULL, struct mp_nav_event);
-        **ret = e;
+    case MP_NAV_EVENT_MENU_MODE:
+        e.u.menu_mode.enable = !dvdnav_is_domain_vts(priv->dvdnav);
+        break;
+    case MP_NAV_EVENT_STILL_FRAME:
+        e.u.still_frame.seconds = priv->still_length;
+        break;
+    }
+    *ret = talloc(NULL, struct mp_nav_event);
+    **ret = e;
 
-        MP_VERBOSE(s, "DVDNAV: player event '%s'\n",
-                   LOOKUP_NAME(mp_nav_event_types, e.event));
-    }
+    MP_VERBOSE(s, "DVDNAV: player event '%s'\n",
+                LOOKUP_NAME(mp_nav_event_types, e.event));
 }
 
 static int fill_buffer(stream_t *s, char *buf, int max_len)
@@ -414,6 +419,8 @@ static int fill_buffer(stream_t *s, char *buf, int max_len)
                 priv->had_initial_vts = true;
                 break;
             }
+            // clear all previous events
+            priv->next_event = 0;
             priv->next_event |= 1 << MP_NAV_EVENT_RESET;
             priv->next_event |= 1 << MP_NAV_EVENT_RESET_ALL;
             if (dvdnav_current_title_info(dvdnav, &tit, &part) == DVDNAV_STATUS_OK)

stream/stream_mf.c

@@ -33,6 +33,7 @@ mf_stream_open (stream_t *stream, int mode)
 {
   stream->type = STREAMTYPE_MF;
   stream->demuxer = "mf";
+  stream->allow_caching = false;
 
   return STREAM_OK;
 }

video/decode/lavc.h

@@ -91,5 +91,6 @@ void mp_buffer_ref(struct FrameBuffer *buffer);
 void mp_buffer_unref(struct FrameBuffer *buffer);
 bool mp_buffer_is_unique(struct FrameBuffer *buffer);
 void mp_buffer_pool_free(struct FramePool **pool);
+bool mp_buffer_check(struct FrameBuffer *buffer);
 
 #endif

video/decode/lavc_dr1.c

@@ -204,6 +204,16 @@ void mp_buffer_ref(struct FrameBuffer *buf)
     pool_unlock();
 }
 
+bool mp_buffer_check(struct FrameBuffer *buf)
+{
+    pool_lock();
+    bool ok = buf->refcount > 0;
+    if (ok)
+        buf->refcount++;
+    pool_unlock();
+    return ok;
+}
+
 void mp_buffer_unref(struct FrameBuffer *buf)
 {
     FramePool *pool = buf->pool;

video/decode/vd_lavc.c

@@ -706,7 +706,16 @@ static struct mp_image *image_from_decoder(struct dec_video *vd)
         mp_image_copy_attributes(mpi, &new);
     } else if (ctx->do_dr1 && pic->opaque) {
         struct FrameBuffer *fb = pic->opaque;
-        mp_buffer_ref(fb); // initial reference for mpi
+        // initial reference for mpi
+        if (!new.planes[0] || !mp_buffer_check(fb)) {
+            // Decoder returned an unreferenced buffer! Taking this would just
+            // lead to an eventual double-free. Nothing we can do about this.
+            // So just say "fuck you" in a nice way.
+            MP_FATAL(vd,
+    "Impossible condition detected! This version of Libav/FFmpeg is not\n"
+    "supported anymore. Please update.\n");
+            return NULL;
+        }
         mpi = mp_image_new_external_ref(&new, fb, fb_ref, fb_unref,
                                         fb_is_unique, NULL);
     } else {
@@ -752,6 +761,8 @@ static int decode(struct dec_video *vd, struct demux_packet *packet,
 
     // Note: potentially resets ctx->pic as it is transferred to mpi
     struct mp_image *mpi = image_from_decoder(vd);
+    if (!mpi)
+        return 0;
     assert(mpi->planes[0]);
     mp_image_set_params(mpi, &params);
 

video/filter/vf_eq.c

@@ -469,7 +469,6 @@ int vf_open(vf_instance_t *vf)
   vf->filter = filter;
   vf->uninit = uninit;
 
-  vf->priv = malloc (sizeof (vf_eq2_t));
   eq2 = vf->priv;
   eq2->log = vf->log;
 

video/out/w32_common.c

@@ -330,9 +330,16 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
                 // Window dragging hack
                 ReleaseCapture();
                 SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0);
+                mp_input_put_key(vo->input_ctx, MP_MOUSE_BTN0 |
+                                                MP_KEY_STATE_UP);
                 return 0;
             }
         }
+
+        if (mouse_button & MP_KEY_STATE_DOWN)
+            SetCapture(w32->window);
+        else
+            ReleaseCapture();
     }
 
     return DefWindowProcW(hWnd, message, wParam, lParam);

waftools/generators/headers.py

@@ -6,7 +6,7 @@ def __get_version__(ctx):
                                cwd=ctx.srcnode.abspath())
     process.wait()
     (version, err) = process.communicate()
-    return version.strip().decode("utf-8")
+    return version.strip().decode('utf-8').encode('ascii', 'ignore')
 
 def __get_build_date__():
     import time

wscript_build.py

@@ -239,7 +239,6 @@ def build(ctx):
         ( "stream/ai_sndio.c",                   "sndio" ),
         ( "stream/audio_in.c",                   "audio-input" ),
         ( "stream/cache.c" ),
-        ( "stream/cdinfo.c",                     "cdda"),
         ( "stream/cookies.c" ),
         ( "stream/dvb_tune.c",                   "dvbin" ),
         ( "stream/frequencies.c",                "tv" ),