diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-09-28 19:01:49 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-09-29 11:09:55 +0100 |
| commit | 7db33440a800f134204a1ee7d2d595da1771c3ed (patch) | |
| tree | 7d8c74c5256b65bb9ae6e5ef78956570e9a1f27e | |
| parent | ac9c8b6359be770f1ed3e97100c497bd91338874 (diff) | |
g3dvl: Define PIPE_VIDEO_CODEC_UNKNOWN for failures.
gcc 4.4 seems particularly picky with int -> enum conversions.
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 1 | ||||
| -rw-r--r-- | 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 1980831dd9..ad42beff47 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 a0128fbd48..b71e959e6f 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 |