generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavu: add av_x_if_null().

Browse Source
This commit is contained in:
Clément Bœsch 2011-09-16 12:52:45 +02:00
parent 3039c68626
commit a70e787410
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first: API changes, most recent first:
2011-09-22 - xxxxxxx - lavu 51.17.0
Add av_x_if_null().
2011-09-18 - xxxxxxx - lavc 53.16.0 2011-09-18 - xxxxxxx - lavc 53.16.0
Add showall flag2 Add showall flag2

12
libavutil/avutil.h
View File

@ -40,8 +40,8 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR 16 #define LIBAVUTIL_VERSION_MINOR 17
#define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \
@ -135,6 +135,14 @@ enum AVPictureType {
*/ */
char av_get_picture_type_char(enum AVPictureType pict_type); 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 "common.h"
#include "error.h" #include "error.h"
#include "mathematics.h" #include "mathematics.h"