[FFmpeg-devel] [PATCH] rename have_incompatible_fork_abi -> have_incompatible_libav_abi

[Stefano Sabatini]

"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function.

Note: this change requires to change --enable-incompatible-fork-abi to
--enable-incompatible-libav-abi, since it is more or less an internal
flag this should not raise a serious problem.
---
 configure               | 4 ++--
 libavcodec/avcodec.h    | 2 +-
 libavcodec/imgconvert.c | 2 +-
 libavcodec/vdpau.h      | 4 ++--
 libavutil/pixfmt.h      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index dbb6672..dc3c59c 100755
--- a/configure
+++ b/configure
@@ -1257,7 +1257,7 @@ CONFIG_LIST="
     gpl
     gray
     hardcoded_tables
-    incompatible_fork_abi
+    incompatible_libav_abi
     lsp
     lzo
     mdct
@@ -1363,7 +1363,7 @@ HAVE_LIST_CMDLINE='
 HAVE_LIST_PUB='
     bigendian
     fast_unaligned
-    incompatible_fork_abi
+    incompatible_libav_abi
 '
 
 MATH_FUNCS="
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c38b46d..c7d28bc 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4490,7 +4490,7 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt
                                             enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
 
 attribute_deprecated
-#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
                                               enum AVPixelFormat src_pix_fmt,
                                               int has_alpha, int *loss_ptr);
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index a2bcdbc..1835e00 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -247,7 +247,7 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt
     return dst_pix_fmt;
 }
 
-#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
                                             enum AVPixelFormat src_pix_fmt,
                                             int has_alpha, int *loss_ptr){
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index f5b2317..a8d708c 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -136,7 +136,7 @@ struct vdpau_render_state {
 
     int state; ///< Holds FF_VDPAU_STATE_* values.
 
-#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
     /** picture parameter information for all supported codecs */
     union FFVdpPictureInfo info;
 #endif
@@ -148,7 +148,7 @@ struct vdpau_render_state {
     /** The user is responsible for freeing this buffer using av_freep(). */
     VdpBitstreamBuffer *bitstream_buffers;
 
-#if !AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
     /** picture parameter information for all supported codecs */
     union FFVdpPictureInfo info;
 #endif
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 9a25c2c..ae32a8f 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -245,7 +245,7 @@ enum AVPixelFormat {
 #endif
 };
 
-#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 #define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
 #define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
 #endif
-- 
1.8.1.2