From 7db33440a800f134204a1ee7d2d595da1771c3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Mon, 28 Sep 2009 19:01:49 +0100 Subject: [PATCH] g3dvl: Define PIPE_VIDEO_CODEC_UNKNOWN for failures. gcc 4.4 seems particularly picky with int -> enum conversions. --- src/gallium/include/pipe/p_defines.h | 1 + src/gallium/include/pipe/p_video_state.h | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 1980831dd9d..ad42beff471 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -318,6 +318,7 @@ enum pipe_transfer_usage { enum pipe_video_codec { + PIPE_VIDEO_CODEC_UNKNOWN = 0, PIPE_VIDEO_CODEC_MPEG12, /**< MPEG1, MPEG2 */ PIPE_VIDEO_CODEC_MPEG4, /**< DIVX, XVID */ PIPE_VIDEO_CODEC_VC1, /**< WMV */ diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h index a0128fbd48f..b71e959e6f1 100644 --- a/src/gallium/include/pipe/p_video_state.h +++ b/src/gallium/include/pipe/p_video_state.h @@ -63,10 +63,9 @@ u_reduce_video_profile(enum pipe_video_profile profile) return PIPE_VIDEO_CODEC_MPEG4_AVC; default: - assert(false); + assert(0); + return PIPE_VIDEO_CODEC_UNKNOWN; } - - return -1; } enum pipe_mpeg12_picture_type