diff options
| author | Christian König <[email protected]> | 2011-01-10 23:41:08 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-10 23:41:08 +0100 |
| commit | 9032d2a13ecd019206a48767d9205c0aafa7cca2 (patch) | |
| tree | 5bd816287ab7ace941a455e02b1da7bd94571cf9 /src/gallium/include/pipe/p_defines.h | |
| parent | b725bbebae19890ceaaa31c1d7fb7f155ac3b6ef (diff) | |
| parent | 2b296ec77c2b95e7632b45100de5a0878ac2a294 (diff) | |
Merge remote branch 'vdpau/pipe-video' into pipe-video
Conflicts:
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_format.h
src/gallium/state_trackers/xorg/xvmc/context.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/gallium/include/pipe/p_defines.h')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 7aaf6110456..f60b131f941 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -506,6 +506,7 @@ enum pipe_video_codec enum pipe_video_profile { + PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_PROFILE_MPEG1, PIPE_VIDEO_PROFILE_MPEG2_SIMPLE, PIPE_VIDEO_PROFILE_MPEG2_MAIN, @@ -519,6 +520,7 @@ enum pipe_video_profile PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH }; + /** * Composite query types */ @@ -533,6 +535,7 @@ struct pipe_query_data_timestamp_disjoint boolean disjoint; }; + #ifdef __cplusplus } #endif |