diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-08 16:41:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-08 16:41:27 +0100 |
| commit | 03346747e21e4cd1db30c6a5d8af6705575e3755 (patch) | |
| tree | 120604af21bdac64007a0a3005dcce420cb76714 /mesalib/src/gallium/auxiliary/util | |
| parent | ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a (diff) | |
| download | vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.tar.gz vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.tar.bz2 vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.zip | |
mesa git update 8 feb 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_debug.h | 2 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_video.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.h b/mesalib/src/gallium/auxiliary/util/u_debug.h index ed19cda05..06470f66a 100644 --- a/mesalib/src/gallium/auxiliary/util/u_debug.h +++ b/mesalib/src/gallium/auxiliary/util/u_debug.h @@ -101,7 +101,7 @@ debug_printf(const char *format, ...) * ... isn't portable so we need to pass arguments in parentheses. * * usage: - * debug_printf_once(("awnser: %i\n", 42)); + * debug_printf_once(("answer: %i\n", 42)); */ #define debug_printf_once(args) \ do { \ diff --git a/mesalib/src/gallium/auxiliary/util/u_video.h b/mesalib/src/gallium/auxiliary/util/u_video.h index be3fac2d0..e575947d4 100644 --- a/mesalib/src/gallium/auxiliary/util/u_video.h +++ b/mesalib/src/gallium/auxiliary/util/u_video.h @@ -64,7 +64,6 @@ u_reduce_video_profile(enum pipe_video_profile profile) return PIPE_VIDEO_CODEC_MPEG4_AVC; default: - assert(0); return PIPE_VIDEO_CODEC_UNKNOWN; } } |