diff options
| author | Jason Ekstrand <[email protected]> | 2016-03-15 14:09:50 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-03-15 14:09:50 -0700 |
| commit | 7f6a0cb29c89a03441be744680a2145445be3a3c (patch) | |
| tree | 516824ab49962521563b95fa79430cf948baaccc /src/gallium/auxiliary/util/u_video.h | |
| parent | b83785d86d2c7f07323920615c72a9f09695a9a7 (diff) | |
| parent | e103b52aec773537d2821d8acc42ac9caa2a4b17 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/gallium/auxiliary/util/u_video.h')
| -rw-r--r-- | src/gallium/auxiliary/util/u_video.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h index ddc00216105..9196afc11be 100644 --- a/src/gallium/auxiliary/util/u_video.h +++ b/src/gallium/auxiliary/util/u_video.h @@ -28,10 +28,6 @@ #ifndef U_VIDEO_H #define U_VIDEO_H -#ifdef __cplusplus -extern "C" { -#endif - #include "pipe/p_defines.h" #include "pipe/p_video_enums.h" @@ -40,6 +36,10 @@ extern "C" { #include "util/u_debug.h" #include "util/u_math.h" +#ifdef __cplusplus +extern "C" { +#endif + static inline enum pipe_video_format u_reduce_video_profile(enum pipe_video_profile profile) { |