diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-17 19:19:13 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-17 19:19:13 +0100 |
| commit | 9c56c49e73319a339f77969c61aa6df7574e9bc6 (patch) | |
| tree | 5fee115d1d8c6e58f83dcdfee945824d9a5364b6 | |
| parent | c5720a15c76a15debadc9205afa2558f11e5d9ff (diff) | |
| parent | acb798e54481916c5fa25e3c227eb1f1c7316a10 (diff) | |
Merge tag 'v0.18.21' into v0.19.x
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 11 | ||||
| -rw-r--r-- | src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx | 2 |
3 files changed, 17 insertions, 5 deletions
@@ -7,7 +7,10 @@ ver 0.19.7 (not yet released) * storage - nfs: implement I/O timeout (60 seconds) * playlist + - embcue: fix filename suffix detection - don't skip non-existent songs in "listplaylist" +* decoder + - ffmpeg: fix time stamp underflow * fix memory allocator bug on Windows ver 0.19.6 (2014/12/08) @@ -158,6 +161,12 @@ ver 0.19 (2014/10/10) * install systemd unit for socket activation * Android port +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 diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index e150fa3bf..494f4048b 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -313,10 +313,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) - decoder_timestamp(decoder, - time_from_ffmpeg(packet->pts - start_time_fallback(*stream), - stream->time_base)); + 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, + stream->time_base)); + } AVPacket packet2 = *packet; diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx index 9e8f91e05..8baa11c03 100644 --- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx @@ -178,7 +178,7 @@ const struct playlist_plugin embcue_playlist_plugin = { embcue_playlist_open_uri, nullptr, - embcue_playlist_suffixes, nullptr, + embcue_playlist_suffixes, nullptr, }; |