diff options
author | Christian König <[email protected]> | 2013-07-15 03:48:04 -0600 |
---|---|---|
committer | Christian König <[email protected]> | 2013-08-19 10:21:15 +0200 |
commit | f2f7064e560a83fc78d0e5b1d3a7d4aaac119a49 (patch) | |
tree | de24046b5c46851ca3ef8507fd396cc0fb69abad /src/gallium/drivers/r600 | |
parent | 8e423ab98403135140a093be3c66c88b9a36ad5c (diff) |
vl: rename pipe_video_decoder to pipe_video_codec
Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
-rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_uvd.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index e5aa55e46a9..c8fb547a30a 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -400,10 +400,10 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void r600_init_surface_functions(rctx); if (rscreen->info.has_uvd) { - rctx->context.create_video_decoder = r600_uvd_create_decoder; + rctx->context.create_video_codec = r600_uvd_create_decoder; rctx->context.create_video_buffer = r600_video_buffer_create; } else { - rctx->context.create_video_decoder = vl_create_decoder; + rctx->context.create_video_codec = vl_create_decoder; rctx->context.create_video_buffer = vl_video_buffer_create; } diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index eaef920b156..743f9abf6ab 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -890,8 +890,8 @@ unsigned r600_tex_compare(unsigned compare); bool sampler_state_needs_border_color(const struct pipe_sampler_state *state); /* r600_uvd.c */ -struct pipe_video_decoder *r600_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *decoder); +struct pipe_video_codec *r600_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *decoder); struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, const struct pipe_video_buffer *tmpl); diff --git a/src/gallium/drivers/r600/r600_uvd.c b/src/gallium/drivers/r600/r600_uvd.c index 288790591ce..8fb58614ad2 100644 --- a/src/gallium/drivers/r600/r600_uvd.c +++ b/src/gallium/drivers/r600/r600_uvd.c @@ -36,7 +36,7 @@ #include <errno.h> #include <unistd.h> -#include "pipe/p_video_decoder.h" +#include "pipe/p_video_codec.h" #include "util/u_memory.h" #include "util/u_video.h" @@ -164,8 +164,8 @@ static struct radeon_winsys_cs_handle* r600_uvd_set_dtb(struct ruvd_msg *msg, st } /* create decoder */ -struct pipe_video_decoder *r600_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templat) +struct pipe_video_codec *r600_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templat) { struct r600_context *ctx = (struct r600_context *)context; |