summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/xvmc
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-07-15 03:48:04 -0600
committerChristian König <christian.koenig@amd.com>2013-08-19 10:21:15 +0200
commitf2f7064e560a83fc78d0e5b1d3a7d4aaac119a49 (patch)
treede24046b5c46851ca3ef8507fd396cc0fb69abad /src/gallium/state_trackers/xvmc
parent8e423ab98403135140a093be3c66c88b9a36ad5c (diff)
downloadexternal_mesa3d-f2f7064e560a83fc78d0e5b1d3a7d4aaac119a49.zip
external_mesa3d-f2f7064e560a83fc78d0e5b1d3a7d4aaac119a49.tar.gz
external_mesa3d-f2f7064e560a83fc78d0e5b1d3a7d4aaac119a49.tar.bz2
vl: rename pipe_video_decoder to pipe_video_codec
Signed-off-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'src/gallium/state_trackers/xvmc')
-rw-r--r--src/gallium/state_trackers/xvmc/context.c6
-rw-r--r--src/gallium/state_trackers/xvmc/subpicture.c2
-rw-r--r--src/gallium/state_trackers/xvmc/surface.c4
-rw-r--r--src/gallium/state_trackers/xvmc/xvmc_private.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/xvmc/context.c b/src/gallium/state_trackers/xvmc/context.c
index d630133..fe12b5d 100644
--- a/src/gallium/state_trackers/xvmc/context.c
+++ b/src/gallium/state_trackers/xvmc/context.c
@@ -31,7 +31,7 @@
#include <X11/extensions/XvMClib.h>
#include "pipe/p_screen.h"
-#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_codec.h"
#include "pipe/p_video_state.h"
#include "pipe/p_state.h"
@@ -191,7 +191,7 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
Status ret;
struct vl_screen *vscreen;
struct pipe_context *pipe;
- struct pipe_video_decoder templat = {};
+ struct pipe_video_codec templat = {};
XvMCContextPrivate *context_priv;
vl_csc_matrix csc;
@@ -253,7 +253,7 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
templat.max_references = 2;
templat.expect_chunked_decode = true;
- context_priv->decoder = pipe->create_video_decoder(pipe, &templat);
+ context_priv->decoder = pipe->create_video_codec(pipe, &templat);
if (!context_priv->decoder) {
XVMC_MSG(XVMC_ERR, "[XvMC] Could not create VL decoder.\n");
diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c
index 3e13aa6..51fcf78 100644
--- a/src/gallium/state_trackers/xvmc/subpicture.c
+++ b/src/gallium/state_trackers/xvmc/subpicture.c
@@ -31,7 +31,7 @@
#include <X11/extensions/XvMClib.h>
#include "pipe/p_screen.h"
-#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_codec.h"
#include "pipe/p_state.h"
#include "util/u_memory.h"
diff --git a/src/gallium/state_trackers/xvmc/surface.c b/src/gallium/state_trackers/xvmc/surface.c
index de90e54..db32142 100644
--- a/src/gallium/state_trackers/xvmc/surface.c
+++ b/src/gallium/state_trackers/xvmc/surface.c
@@ -30,7 +30,7 @@
#include <X11/Xlibint.h>
-#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_codec.h"
#include "pipe/p_video_state.h"
#include "pipe/p_state.h"
@@ -215,7 +215,7 @@ Status XvMCRenderSurface(Display *dpy, XvMCContext *context, unsigned int pictur
)
{
struct pipe_mpeg12_macroblock mb[num_macroblocks];
- struct pipe_video_decoder *decoder;
+ struct pipe_video_codec *decoder;
struct pipe_mpeg12_picture_desc desc;
XvMCContextPrivate *context_priv;
diff --git a/src/gallium/state_trackers/xvmc/xvmc_private.h b/src/gallium/state_trackers/xvmc/xvmc_private.h
index 014d83f..905d7bc 100644
--- a/src/gallium/state_trackers/xvmc/xvmc_private.h
+++ b/src/gallium/state_trackers/xvmc/xvmc_private.h
@@ -42,7 +42,7 @@
#define BLOCK_SIZE_SAMPLES 64
#define BLOCK_SIZE_BYTES (BLOCK_SIZE_SAMPLES * 2)
-struct pipe_video_decoder;
+struct pipe_video_codec;
struct pipe_video_buffer;
struct pipe_sampler_view;
@@ -52,7 +52,7 @@ typedef struct
{
struct vl_screen *vscreen;
struct pipe_context *pipe;
- struct pipe_video_decoder *decoder;
+ struct pipe_video_codec *decoder;
enum VL_CSC_COLOR_STANDARD color_standard;
struct vl_procamp procamp;