Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
9c56c49e
Commit
9c56c49e
authored
Dec 17, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'v0.18.21' into v0.19.x
parents
c5720a15
acb798e5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
NEWS
NEWS
+9
-0
FfmpegDecoderPlugin.cxx
src/decoder/plugins/FfmpegDecoderPlugin.cxx
+7
-4
EmbeddedCuePlaylistPlugin.cxx
src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+1
-1
No files found.
NEWS
View file @
9c56c49e
...
...
@@ -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
...
...
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @
9c56c49e
...
...
@@ -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
;
...
...
src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
View file @
9c56c49e
...
...
@@ -178,7 +178,7 @@ const struct playlist_plugin embcue_playlist_plugin = {
embcue_playlist_open_uri
,
nullptr
,
embcue_playlist_suffixes
,
nullptr
,
embcue_playlist_suffixes
,
nullptr
,
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment