diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-11-24 12:36:09 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-11-25 14:42:10 +0000 |
| commit | e1d192442780a6b60f75b78092a862bd40141099 (patch) | |
| tree | ef2d3ebdcb288030e74bca570f146403d5affbdc | |
| parent | b26dd5ae2fb94caed888005cb6fc21f3df840a24 (diff) | |
| download | ffmpeg-e1d192442780a6b60f75b78092a862bd40141099.tar.gz | |
lavu/pixfmt: Remove gap in the middle of enum AVPixelFormat
This was added for compatibility with libav, by leaving a space for
formats added in libav to be merged. Since that feature has been
removed, we don't need a gap here.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/pixfmt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 4c530fead3..e184a56672 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -230,7 +230,7 @@ enum AVPixelFormat { */ AV_PIX_FMT_CUDA, - AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined + AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined diff --git a/libavutil/version.h b/libavutil/version.h index 3328faebf5..41dc6ad40b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 2 +#define LIBAVUTIL_VERSION_MINOR 3 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |