diff options
| author | wm4 <wm4@nowhere> | 2013-11-23 21:26:31 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-23 21:26:31 +0100 |
| commit | 4fa2babacc290b94bed0938658447205c0545e27 (patch) | |
| tree | 1d5cae1fe22e9e12b3fdb442279a565782953a55 /video/out | |
| parent | 9f4820f6ec1721dc73335cb64b5a5e63170bf379 (diff) | |
| download | mpv-4fa2babacc290b94bed0938658447205c0545e27.tar.bz2 mpv-4fa2babacc290b94bed0938658447205c0545e27.tar.xz | |
video: move struct mp_hwdec_info into its own header file
This means most code accessing this struct must now include hwdec.h
instead of dec_video.h. I just put it into dec_video.h at first because
I thought a separate file would be a waste, but it's more proper to do
it this way, as there are too many files which include dec_video.h only
to get the mp_hwdec_info definition.
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/gl_hwdec_vaglx.c | 2 | ||||
| -rw-r--r-- | video/out/gl_hwdec_vdpau.c | 2 | ||||
| -rw-r--r-- | video/out/vo_opengl.c | 2 | ||||
| -rw-r--r-- | video/out/vo_vaapi.c | 2 | ||||
| -rw-r--r-- | video/out/vo_vdpau.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/video/out/gl_hwdec_vaglx.c b/video/out/gl_hwdec_vaglx.c index abfc656337..8bcc1724de 100644 --- a/video/out/gl_hwdec_vaglx.c +++ b/video/out/gl_hwdec_vaglx.c @@ -26,7 +26,7 @@ #include "x11_common.h" #include "gl_common.h" #include "video/vaapi.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" struct priv { struct mp_vaapi_ctx *ctx; diff --git a/video/out/gl_hwdec_vdpau.c b/video/out/gl_hwdec_vdpau.c index 02f667499c..58e1ab2d8d 100644 --- a/video/out/gl_hwdec_vdpau.c +++ b/video/out/gl_hwdec_vdpau.c @@ -22,7 +22,7 @@ #include "gl_common.h" #include "video/vdpau.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" // This is a GL_NV_vdpau_interop specification bug, and headers (unfortunately) // follow it. I'm not sure about the original nvidia headers. diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 08dd84689d..71a5092288 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -48,7 +48,7 @@ #include "gl_osd.h" #include "filter_kernels.h" #include "video/memcpy_pic.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" #include "gl_video.h" #include "gl_lcms.h" diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index 637c4442fa..83528a2100 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -39,7 +39,7 @@ #include "video/vfcap.h" #include "video/mp_image.h" #include "video/vaapi.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" struct vaapi_osd_image { int w, h; diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 6845beea08..e1816b1595 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -36,7 +36,7 @@ #include "config.h" #include "video/vdpau.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" #include "mpvcore/mp_msg.h" #include "mpvcore/options.h" #include "talloc.h" |