[FFmpeg-devel] [PATCH 3/6] avutil: delay removal of the PIX_FMT_* flags

[Andreas Cadhalpun]

Only the PixelFormat removal is not delayed, because it is a very generic name.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavutil/pixfmt.h  | 4 +++-
 libavutil/version.h | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 5cdbeb9..e8981b2 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -408,9 +408,11 @@ enum AVPixelFormat {
 #define AV_PIX_FMT_AYUV64     AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
 
 
-#if FF_API_PIX_FMT
+#if FF_API_PIXELFORMAT
 #define PixelFormat AVPixelFormat
+#endif
 
+#if FF_API_PIX_FMT
 #define PIX_FMT_Y400A AV_PIX_FMT_Y400A
 #define PIX_FMT_GBR24P AV_PIX_FMT_GBR24P
 
diff --git a/libavutil/version.h b/libavutil/version.h
index 07acf67..23bc444 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -83,8 +83,11 @@
 #ifndef FF_API_OLD_AVOPTIONS
 #define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
+#ifndef FF_API_PIXELFORMAT
+#define FF_API_PIXELFORMAT              (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
 #ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 55)
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_CONTEXT_SIZE
 #define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 55)
-- 
2.4.6