summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-14 13:19:17 +0200
committerwm4 <wm4@nowhere>2015-08-14 13:20:00 +0200
commita6e33b4290600ed89f241632a6417b9d87485352 (patch)
tree3b29d72716c34247b8f60af47bba332bc6d963a3 /video
parent70c990cda5dc3e8d816223ceb2338cda1da4882a (diff)
downloadmpv-a6e33b4290600ed89f241632a6417b9d87485352.tar.bz2
mpv-a6e33b4290600ed89f241632a6417b9d87485352.tar.xz
vo_rpi: fix NULL pointer deref
Can happen in obscure situations and with hw decoding disabled.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo_rpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c
index f49f9a409b..615a5a8997 100644
--- a/video/out/vo_rpi.c
+++ b/video/out/vo_rpi.c
@@ -380,7 +380,7 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
p->display_synced = frame->display_synced;
- if (vo->params->imgfmt != IMGFMT_MMAL) {
+ if (mpi && mpi->imgfmt != IMGFMT_MMAL) {
MMAL_BUFFER_HEADER_T *buffer = mmal_queue_wait(p->swpool->queue);
if (!buffer) {
talloc_free(mpi);