summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Vesely <[email protected]>2014-12-02 15:14:16 -0500
committerChristian König <[email protected]>2014-12-03 17:07:08 +0100
commita2f2eebfdfb9c19e45792101fc5cad3dd3f0f4d6 (patch)
tree4f8f938604092ff8708420071af4efbc9b41f89f /src
parent712a4c5438d0ce257344b5196c20ad7929b54a0e (diff)
st/xvmc: Fix compiler warnings
Mostly signed/unsigned comparison Signed-off-by: Jan Vesely <[email protected]> Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/xvmc/context.c6
-rw-r--r--src/gallium/state_trackers/xvmc/subpicture.c2
-rw-r--r--src/gallium/state_trackers/xvmc/xvmc_private.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/xvmc/context.c b/src/gallium/state_trackers/xvmc/context.c
index 2329e2ae3d8..9ded2e5f2e2 100644
--- a/src/gallium/state_trackers/xvmc/context.c
+++ b/src/gallium/state_trackers/xvmc/context.c
@@ -67,7 +67,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
*found_port = false;
- for (unsigned int i = 0; i < XScreenCount(dpy); ++i) {
+ for (int i = 0; i < XScreenCount(dpy); ++i) {
ret = XvQueryAdaptors(dpy, XRootWindow(dpy, i), &num_adaptors, &adaptor_info);
if (ret != Success)
return ret;
@@ -87,7 +87,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
return BadAlloc;
}
- for (unsigned int l = 0; l < num_types && !found_surface; ++l) {
+ for (int l = 0; l < num_types && !found_surface; ++l) {
if (surface_info[l].surface_type_id != surface_type_id)
continue;
@@ -191,7 +191,7 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
Status ret;
struct vl_screen *vscreen;
struct pipe_context *pipe;
- struct pipe_video_codec templat = {};
+ struct pipe_video_codec templat = {0};
XvMCContextPrivate *context_priv;
vl_csc_matrix csc;
diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c
index 7a951fa7d77..6f42216262f 100644
--- a/src/gallium/state_trackers/xvmc/subpicture.c
+++ b/src/gallium/state_trackers/xvmc/subpicture.c
@@ -112,7 +112,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id, int xvi
{
XvImageFormatValues *subpictures;
int num_subpics;
- unsigned int i;
+ int i;
subpictures = XvMCListSubpictureTypes(dpy, port, surface_type_id, &num_subpics);
if (num_subpics < 1) {
diff --git a/src/gallium/state_trackers/xvmc/xvmc_private.h b/src/gallium/state_trackers/xvmc/xvmc_private.h
index eaf388ad8c3..84c7b6cba0b 100644
--- a/src/gallium/state_trackers/xvmc/xvmc_private.h
+++ b/src/gallium/state_trackers/xvmc/xvmc_private.h
@@ -69,7 +69,7 @@ typedef struct
struct pipe_video_buffer *video_buffer;
/* nonzero if this picture is already being decoded */
- int picture_structure;
+ unsigned picture_structure;
XvMCSurface *ref[2];
@@ -106,7 +106,7 @@ typedef struct
#define XVMC_WARN 2
#define XVMC_TRACE 3
-static INLINE void XVMC_MSG(unsigned int level, const char *fmt, ...)
+static INLINE void XVMC_MSG(int level, const char *fmt, ...)
{
static int debug_level = -1;