Merge branch 'pipe-video' of git://anongit.freedesktop.org/~deathsimple/xvmc-r600...

[mesa.git] / src / gallium / include / pipe / p_defines.h

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index e30b9904fa51e2091fd7e45caf51671dceb0f71f..f8eeebf6a7197b9ce9d0abbff3b9bb8099303498 100644 (file)
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -494,7 +494,10 @@ enum pipe_shader_cap
 #define PIPE_REFERENCED_FOR_READ  (1 << 0)
 #define PIPE_REFERENCED_FOR_WRITE (1 << 1)
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 enum pipe_video_codec
 {
    PIPE_VIDEO_CODEC_UNKNOWN = 0,
@@ -520,7 +523,10 @@ enum pipe_video_profile
    PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH
 };
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 /**
  * Composite query types
  */
@@ -534,7 +540,10 @@ struct pipe_query_data_timestamp_disjoint
    uint64_t frequency;
    boolean  disjoint;
 };
+<<<<<<< HEAD
 
+=======
+>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97
 
 #ifdef __cplusplus
 }