release v0.18.21

The definition of the playlist_plugin struct member of the embcue
plugin was incorrect.

NEWS

@@ -1,3 +1,9 @@
+ver 0.18.21 (2014/12/17)
+* playlist
+  - embcue: fix filename suffix detection
+* decoder
+  - ffmpeg: fix time stamp underflow
+
 ver 0.18.20 (2014/12/08)
 * decoder
   - ffmpeg: support FFmpeg 2.5

configure.ac

@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)
 
-AC_INIT(mpd, 0.18.20, mpd-devel@musicpd.org)
+AC_INIT(mpd, 0.18.21, mpd-devel@musicpd.org)
 
 VERSION_MAJOR=0
 VERSION_MINOR=18
-VERSION_REVISION=20
+VERSION_REVISION=21
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/Main.cxx])

src/decoder/FfmpegDecoderPlugin.cxx

@@ -284,10 +284,13 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
 		   AVFrame *frame,
 		   uint8_t **buffer, int *buffer_size)
 {
-	if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE)
+	if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE) {
+		auto start = start_time_fallback(*stream);
+		if (packet->pts >= start)
 			decoder_timestamp(decoder,
-				  time_from_ffmpeg(packet->pts - start_time_fallback(*stream),
+					  time_from_ffmpeg(packet->pts - start,
 							   stream->time_base));
+	}
 
 	AVPacket packet2 = *packet;
 

src/playlist/EmbeddedCuePlaylistPlugin.cxx

@@ -178,7 +178,7 @@ const struct playlist_plugin embcue_playlist_plugin = {
 	embcue_playlist_open_uri,
 	nullptr,
 
+	nullptr,
 	embcue_playlist_suffixes,
 	nullptr,
-	nullptr,
 };