diff options
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/ffmpeg_metadata.c | 2 | ||||
| -rw-r--r-- | src/decoder_api.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/decoder/ffmpeg_metadata.c b/src/decoder/ffmpeg_metadata.c index df700fc01..3d59ec1a9 100644 --- a/src/decoder/ffmpeg_metadata.c +++ b/src/decoder/ffmpeg_metadata.c @@ -28,8 +28,8 @@ static const struct tag_table ffmpeg_tags[] = { #if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8)) { "author", TAG_ARTIST }, - { "year", TAG_DATE }, #endif + { "year", TAG_DATE }, { "author-sort", TAG_ARTIST_SORT }, { "album_artist", TAG_ALBUM_ARTIST }, { "album_artist-sort", TAG_ALBUM_ARTIST_SORT }, diff --git a/src/decoder_api.c b/src/decoder_api.c index 3d7f20c50..8f12d017a 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -90,6 +90,12 @@ decoder_prepare_initial_seek(struct decoder *decoder) const struct decoder_control *dc = decoder->dc; assert(dc->pipe != NULL); + if (dc->state != DECODE_STATE_DECODE) + /* wait until the decoder has finished initialisation + (reading file headers etc.) before emitting the + virtual "SEEK" command */ + return false; + if (decoder->initial_seek_running) /* initial seek has already begun - override any other command */ |