diff options
| author | wm4 <wm4@nowhere> | 2015-12-26 19:18:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-12-26 19:18:47 +0100 |
| commit | aa587580c83f909b71f7b3f56ecb986e7ba6d5a1 (patch) | |
| tree | 59ee56091bec5adeadcb9b25a8e90f6d640ca1e8 /video | |
| parent | 4d43a0c99788f4f2028d680d122e11d265a0ea10 (diff) | |
| download | mpv-aa587580c83f909b71f7b3f56ecb986e7ba6d5a1.tar.bz2 mpv-aa587580c83f909b71f7b3f56ecb986e7ba6d5a1.tar.xz | |
vo_rpi: fix compilation
Untested, but should be fine. Broken by commit 0a0bb905.
Also fix the include statement in context_rpi.c, which caused another
compilation failure. Also untested. (Because I'm lazy.)
Fixes #2638.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/opengl/context_rpi.c | 2 | ||||
| -rw-r--r-- | video/out/vo_rpi.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/video/out/opengl/context_rpi.c b/video/out/opengl/context_rpi.c index 55594413a8..4709e3e1d4 100644 --- a/video/out/opengl/context_rpi.c +++ b/video/out/opengl/context_rpi.c @@ -27,7 +27,7 @@ #include "video/out/x11_common.h" #include "context.h" -#include "rpi.h" +#include "context_rpi.h" static void *get_proc_address(const GLubyte *name) { diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c index 7ed6c39b49..39201d2974 100644 --- a/video/out/vo_rpi.c +++ b/video/out/vo_rpi.c @@ -455,15 +455,11 @@ static int reconfig(struct vo *vo, struct mp_image_params *params) disable_renderer(vo); - AVRational dr = {params->d_w, params->d_h}; - AVRational ir = {params->w, params->h}; - AVRational par = av_div_q(dr, ir); - input->format->encoding = opaque ? MMAL_ENCODING_OPAQUE : MMAL_ENCODING_I420; input->format->es->video.width = MP_ALIGN_UP(params->w, ALIGN_W); input->format->es->video.height = MP_ALIGN_UP(params->h, ALIGN_H); input->format->es->video.crop = (MMAL_RECT_T){0, 0, params->w, params->h}; - input->format->es->video.par = (MMAL_RATIONAL_T){par.num, par.den}; + input->format->es->video.par = (MMAL_RATIONAL_T){params->p_w, params->d_w}; input->format->es->video.color_space = map_csp(params->colorspace); if (mmal_port_format_commit(input)) |