summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2022-10-28 08:42:53 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2023-02-01 15:40:21 +0200
commit1b69012e85bfc1dcc0b4fd32054def9451a3ea4f (patch)
treee24e463efc2f1948cde1b73a2605356520a846e6
parent9aee418de6a7aee0602c271712b76b0ffe319ab7 (diff)
sna: Don't redefine NV12 stuff if already defined
Modern server headers already define NV12 for us. Avoid the redefine. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rw-r--r--src/sna/sna_video.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sna/sna_video.h b/src/sna/sna_video.h
index 06d43796..25b97192 100644
--- a/src/sna/sna_video.h
+++ b/src/sna/sna_video.h
@@ -38,7 +38,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X')
#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')
#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')
+#ifndef FOURCC_NV12
#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N')
+#endif
#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')
/*
@@ -71,7 +73,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
XvTopToBottom \
}
-/* no standard define for this */
+#ifndef XVIMAGE_NV12
#define XVIMAGE_NV12 { \
FOURCC_NV12, XvYUV, LSBFirst, \
{'N','V','1','2', 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
@@ -79,6 +81,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{'Y','U','V', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
XvTopToBottom \
}
+#endif
#define XVIMAGE_AYUV { \
FOURCC_AYUV, XvYUV, LSBFirst, \