diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-09 08:46:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-09 08:46:41 +0100 |
| commit | 535951cba015f2a2b63292e0ca983d0d6e736b71 (patch) | |
| tree | 8c0e0364a27f250e926abe165b82ca12e5a841bf /mesalib/src/gallium/auxiliary | |
| parent | ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446 (diff) | |
| parent | 474621addc25cb22865c54b70ffbec07c82eb04c (diff) | |
| download | vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.tar.gz vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.tar.bz2 vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
| -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; } } |