diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-30 13:19:27 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-30 13:26:14 +0100 |
| commit | 208282d31657f2b718e151397d16b307cdf8f77b (patch) | |
| tree | 14bedb1393d638bc6920bff68f948b9bb64af200 /src/sna/sna_video_textured.c | |
| parent | 7e3445a330340c1aa2ca5a13d838344438336749 (diff) | |
Suppress a bunch of compiler warnings for using constant strings
We want these allocated in ro memory even if the antique API complains.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video_textured.c')
| -rw-r--r-- | src/sna/sna_video_textured.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c index 1d199238..d3ce2804 100644 --- a/src/sna/sna_video_textured.c +++ b/src/sna/sna_video_textured.c @@ -43,9 +43,9 @@ static XvFormatRec Formats[] = { }; static const XvAttributeRec Attributes[] = { - {XvSettable | XvGettable, -1, 1, "XV_SYNC_TO_VBLANK"}, - //{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"}, - //{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}, + {XvSettable | XvGettable, -1, 1, (char *)"XV_SYNC_TO_VBLANK"}, + //{XvSettable | XvGettable, -128, 127, (char *)"XV_BRIGHTNESS"}, + //{XvSettable | XvGettable, 0, 255, (char *)"XV_CONTRAST"}, }; static const XvImageRec Images[] = { @@ -361,12 +361,12 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) adaptor->type = XvInputMask | XvImageMask; adaptor->pScreen = screen; - adaptor->name = "Intel(R) Textured Video"; + adaptor->name = (char *)"Intel(R) Textured Video"; adaptor->nEncodings = 1; adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec)); adaptor->pEncodings[0].id = 0; adaptor->pEncodings[0].pScreen = screen; - adaptor->pEncodings[0].name = "XV_IMAGE"; + adaptor->pEncodings[0].name = (char *)"XV_IMAGE"; adaptor->pEncodings[0].width = sna->render.max_3d_size; adaptor->pEncodings[0].height = sna->render.max_3d_size; adaptor->pEncodings[0].rate.numerator = 1; @@ -375,9 +375,9 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) adaptor->nFormats = sna_xv_fixup_formats(screen, Formats, ARRAY_SIZE(Formats)); adaptor->nAttributes = ARRAY_SIZE(Attributes); - adaptor->pAttributes = Attributes; + adaptor->pAttributes = (XvAttributeRec *)Attributes; adaptor->nImages = ARRAY_SIZE(Images); - adaptor->pImages = Images; + adaptor->pImages = (XvImageRec *)Images; adaptor->ddAllocatePort = sna_xv_alloc_port; adaptor->ddFreePort = sna_xv_free_port; adaptor->ddPutVideo = NULL; |