Release 0.5.4

I added this non-sense earlier this day. Oops.

RELEASE_NOTES

@@ -1,3 +1,18 @@
+Release 0.5.4
+=============
+
+Bug fixes
+---------
+
+- Fix generation of watch later config file for multiline file names when
+  --write-filename-in-watch-later-config is used (avoid writing the new lines
+  in the config, which would make it possible for the filename to set options).
+- Fix random crashes on audio uninit.
+
+This listing is not complete. There are many more bug fixes and changes. The
+complete change log can be viewed by running ``git log 6f7f7c3..1a7b6f1`` in
+the git repository.
+
 Release 0.5.3
 =============
 

VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

player/configfiles.c

@@ -287,8 +287,7 @@ void mp_write_watch_later_conf(struct MPContext *mpctx)
 
     mp_mk_config_dir(mpctx->global, MP_WATCH_LATER_CONF);
 
-    conffile = mp_get_playback_resume_config_filename(mpctx->global,
-                                                      mpctx->filename);
+    conffile = mp_get_playback_resume_config_filename(mpctx->global, filename);
     if (!conffile)
         goto exit;
 
@@ -297,8 +296,12 @@ void mp_write_watch_later_conf(struct MPContext *mpctx)
     FILE *file = fopen(conffile, "wb");
     if (!file)
         goto exit;
-    if (mpctx->opts->write_filename_in_watch_later_config)
-        fprintf(file, "# %s\n", mpctx->filename);
+    if (mpctx->opts->write_filename_in_watch_later_config) {
+        char write_name[1024] = {0};
+        for (int n = 0; filename[n] && n < sizeof(write_name) - 1; n++)
+            write_name[n] = (unsigned char)filename[n] < 32 ? '_' : filename[n];
+        fprintf(file, "# %s\n", write_name);
+    }
     fprintf(file, "start=%f\n", pos);
     for (int i = 0; backup_properties[i]; i++) {
         const char *pname = backup_properties[i];

player/loadfile.c

@@ -87,10 +87,9 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
         audio_uninit(mpctx->d_audio);
         mpctx->d_audio = NULL;
         talloc_free(mpctx->ao_buffer);
+        mpctx->ao_buffer = NULL;
         mpctx->audio_status = STATUS_EOF;
         reselect_demux_streams(mpctx);
-        if (mpctx->ao_buffer)
-            mp_audio_buffer_clear(mpctx->ao_buffer);
     }
 
     if (mask & INITIALIZED_SUB) {