3 files changed, 13 insertions, 29 deletions
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index c02b060e4bc..ac290495a43 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -59,6 +59,8 @@ struct pipe_vertex_buffer;
 struct pipe_vertex_element;
 struct pipe_viewport_state;
 
+enum pipe_video_profile;
+enum pipe_video_entrypoint;
 enum pipe_video_chroma_format;
 enum pipe_format;
 
@@ -400,6 +402,15 @@ struct pipe_context {
    void (*texture_barrier)(struct pipe_context *);
    
    /**
+    * Creates a video decoder for a specific video codec/profile
+    */
+   struct pipe_video_decoder *(*create_video_decoder)( struct pipe_context *context,
+                                                       enum pipe_video_profile profile,
+                                                       enum pipe_video_entrypoint entrypoint,
+                                                       enum pipe_video_chroma_format chroma_format,
+                                                       unsigned width, unsigned height );
+
+   /**
     * Creates a video buffer as decoding target
     */
    struct pipe_video_buffer *(*create_video_buffer)( struct pipe_context *context,
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 28209346c78..b77cf24d542 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -100,9 +100,6 @@ struct pipe_screen {
 
    struct pipe_context * (*context_create)( struct pipe_screen *, void *priv );
 
-   struct pipe_video_context * (*video_context_create)( struct pipe_screen *screen,
-                                                        struct pipe_context *context );
-
    /**
     * Check if the given pipe_format is supported as a texture or
     * drawing surface.
diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_decoder.h
index 0ac0c4bed0b..deda992a36c 100644
--- a/src/gallium/include/pipe/p_video_context.h
+++ b/src/gallium/include/pipe/p_video_decoder.h
@@ -41,35 +41,11 @@ struct pipe_picture_desc;
 struct pipe_fence_handle;
 
 /**
- * Gallium video rendering context
- */
-struct pipe_video_context
-{
-   struct pipe_screen *screen;
-
-   /**
-    * destroy context, all objects created from this context
-    * (buffers, decoders, compositors etc...) must be freed before calling this
-    */
-   void (*destroy)(struct pipe_video_context *context);
-
-   /**
-    * create a decoder for a specific video profile
-    */
-   struct pipe_video_decoder *(*create_decoder)(struct pipe_video_context *context,
-                                                enum pipe_video_profile profile,
-                                                enum pipe_video_entrypoint entrypoint,
-                                                enum pipe_video_chroma_format chroma_format,
-                                                unsigned width, unsigned height);
-
-};
-
-/**
- * decoder for a specific video codec
+ * Gallium video decoder for a specific codec/profile
  */
 struct pipe_video_decoder
 {
-   struct pipe_video_context *context;
+   struct pipe_context *context;
 
    enum pipe_video_profile profile;
    enum pipe_video_entrypoint entrypoint;