diff options
| -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); +} + +/** * @} * @} */ |