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_sprite.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_sprite.c')
| -rw-r--r-- | src/sna/sna_video_sprite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c index 05d61298..71482539 100644 --- a/src/sna/sna_video_sprite.c +++ b/src/sna/sna_video_sprite.c @@ -53,7 +53,7 @@ static Atom xvColorKey; static XvFormatRec formats[] = { {15}, {16}, {24} }; static const XvImageRec images[] = { XVIMAGE_YUY2, XVIMAGE_UYVY, XVMC_YUV }; static const XvAttributeRec attribs[] = { - { XvSettable | XvGettable, 0, 0xffffff, "XV_COLORKEY" }, + { XvSettable | XvGettable, 0, 0xffffff, (char *)"XV_COLORKEY" }, }; static int sna_video_sprite_stop(ClientPtr client, @@ -479,12 +479,12 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->type = XvInputMask | XvImageMask; adaptor->pScreen = screen; - adaptor->name = "Intel(R) Video Sprite"; + adaptor->name = (char *)"Intel(R) Video Sprite"; 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 = IMAGE_MAX_WIDTH; adaptor->pEncodings[0].height = IMAGE_MAX_HEIGHT; adaptor->pEncodings[0].rate.numerator = 1; @@ -493,9 +493,9 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nFormats = sna_xv_fixup_formats(screen, formats, ARRAY_SIZE(formats)); adaptor->nAttributes = ARRAY_SIZE(attribs); - adaptor->pAttributes = attribs; + adaptor->pAttributes = (XvAttributeRec *)attribs; 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; |