2 files changed, 11 insertions, 11 deletions
diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h
index e66948e1e95..46dad949079 100644
--- a/src/gallium/include/pipe/p_video_enums.h
+++ b/src/gallium/include/pipe/p_video_enums.h
@@ -28,6 +28,15 @@
 #ifndef PIPE_VIDEO_ENUMS_H
 #define PIPE_VIDEO_ENUMS_H
 
+enum pipe_video_format
+{
+   PIPE_VIDEO_FORMAT_UNKNOWN = 0,
+   PIPE_VIDEO_FORMAT_MPEG12,   /**< MPEG1, MPEG2 */
+   PIPE_VIDEO_FORMAT_MPEG4,    /**< DIVX, XVID */
+   PIPE_VIDEO_FORMAT_VC1,      /**< WMV */
+   PIPE_VIDEO_FORMAT_MPEG4_AVC /**< H.264 */
+};
+
 enum pipe_video_profile
 {
    PIPE_VIDEO_PROFILE_UNKNOWN,
@@ -58,15 +67,6 @@ enum pipe_video_cap
    PIPE_VIDEO_CAP_MAX_LEVEL = 8
 };
 
-enum pipe_video_codec
-{
-   PIPE_VIDEO_CODEC_UNKNOWN = 0,
-   PIPE_VIDEO_CODEC_MPEG12,   /**< MPEG1, MPEG2 */
-   PIPE_VIDEO_CODEC_MPEG4,    /**< DIVX, XVID */
-   PIPE_VIDEO_CODEC_VC1,      /**< WMV */
-   PIPE_VIDEO_CODEC_MPEG4_AVC /**< H.264 */
-};
-
 enum pipe_video_entrypoint
 {
    PIPE_VIDEO_ENTRYPOINT_UNKNOWN,
diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index 00390d3e170..1fb6ff2078b 100644
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -108,12 +108,12 @@ struct pipe_picture_desc
 
 struct pipe_quant_matrix
 {
-   enum pipe_video_codec codec;
+   enum pipe_video_format codec;
 };
 
 struct pipe_macroblock
 {
-   enum pipe_video_codec codec;
+   enum pipe_video_format codec;
 };
 
 struct pipe_mpeg12_picture_desc