RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video: fix coverart switching 

If cover art is re-enabled during playback, the covert art picture
(which has pts==0) will be discarded. Add another corner case to
the list.
This commit is contained in:
wm4 2016-01-27 21:10:11 +01:00
parent c7ec8fdfe7
commit dea42f77db
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
player/video.c
View File

@ -698,7 +698,8 @@ static int video_output_image(struct MPContext *mpctx, double endpts)
bool hrseek = mpctx->hrseek_active && mpctx->video_status == STATUS_SYNCING; bool hrseek = mpctx->hrseek_active && mpctx->video_status == STATUS_SYNCING;
struct track *track = mpctx->current_track[0][STREAM_VIDEO]; struct track *track = mpctx->current_track[0][STREAM_VIDEO];
if (track && track->stream && track->stream->attached_picture) { bool is_coverart = track && track->stream && track->stream->attached_picture;
if (is_coverart) {
if (vo_has_frame(mpctx->video_out)) if (vo_has_frame(mpctx->video_out))
return VD_EOF; return VD_EOF;
hrseek = false; hrseek = false;
@ -728,7 +729,7 @@ static int video_output_image(struct MPContext *mpctx, double endpts)
mp_image_setrefp(&mpctx->saved_frame, img); mp_image_setrefp(&mpctx->saved_frame, img);
} else if (mpctx->video_status == STATUS_SYNCING && } else if (mpctx->video_status == STATUS_SYNCING &&
mpctx->playback_pts != MP_NOPTS_VALUE && mpctx->playback_pts != MP_NOPTS_VALUE &&
img->pts < mpctx->playback_pts) img->pts < mpctx->playback_pts && !is_coverart)
{ {
/* skip after stream-switching */ /* skip after stream-switching */
} else { } else {