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

video: fix poitential NULL deref 

Regression introduced by direct rendering code additions. Found by same
static analyzer.
This commit is contained in:
wm4 2017-10-18 12:14:56 +02:00
parent 14f01bd398
commit 872c2403a4
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

@ -319,13 +319,14 @@ int init_video_decoder(struct MPContext *mpctx, struct track *track)
d_video->header = track->stream;
d_video->codec = track->stream->codec;
d_video->fps = d_video->header->codec->fps;
d_video->vo = mpctx->vo_chain->vo;
// Note: at least mpv_opengl_cb_uninit_gl() relies on being able to get
// rid of all references to the VO by destroying the VO chain. Thus,
// decoders not linked to vo_chain must not use the hwdec context.
if (mpctx->vo_chain)
if (mpctx->vo_chain) {
d_video->hwdec_devs = mpctx->vo_chain->hwdec_devs;
d_video->vo = mpctx->vo_chain->vo;
}
MP_VERBOSE(d_video, "Container reported FPS: %f\n", d_video->fps);