diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-09-16 12:52:45 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-09-22 00:22:52 +0200 |
| commit | a70e787410b1700a379f34c9459820048a3c1603 (patch) | |
| tree | b2dbf73e9b853a529e8b3e099bae663591e09273 /libavutil | |
| parent | 3039c68626d924118d9061259cb898a5d978f758 (diff) | |
| download | ffmpeg-a70e787410b1700a379f34c9459820048a3c1603.tar.gz | |
lavu: add av_x_if_null().
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/avutil.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 9282e5b897..3d46365960 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -40,8 +40,8 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 16 -#define LIBAVUTIL_VERSION_MICRO 1 +#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -135,6 +135,14 @@ enum AVPictureType { */ 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" |