diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-12-03 11:21:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-03 15:18:15 +0100 |
| commit | 757cb3b46a5ae81c169a83975dc25040e7864475 (patch) | |
| tree | 5c0ea14563aff31f52ca8e5b924b411e399456c1 /libavutil/avutil.h | |
| parent | 730945d941aec27d40c51d74850166228cec9ea1 (diff) | |
| download | ffmpeg-757cb3b46a5ae81c169a83975dc25040e7864475.tar.gz | |
avutil: av_x_if_null: remove const for the return value.
This is the usual weirdness with const/non-const pointers through a function.
See the prototype of strchr for a standard example.
The function had to be moved down, below the point where stdint.h is
indirectly included.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avutil.h')
| -rw-r--r-- | libavutil/avutil.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index dd8587574a..85c7dbd063 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -324,14 +324,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type); * @} */ -/** - * Return x default pointer in case p is NULL. - */ -static inline const void *av_x_if_null(const void *p, const void *x) -{ - return p ? p : x; -} - #include "common.h" #include "error.h" #include "mathematics.h" @@ -341,6 +333,14 @@ static inline const void *av_x_if_null(const void *p, const void *x) #include "pixfmt.h" /** + * Return x default pointer in case p is NULL. + */ +static inline void *av_x_if_null(const void *p, const void *x) +{ + return (void *)(intptr_t)(p ? p : x); +} + +/** * @} * @} */ |