From 5efbeae38cdcf8ed099be06f59fb422b5004e163 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Mon, 1 Jul 2013 18:47:09 +0200 Subject: configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi "Fork" is an ambiguous term, since there may be more than one fork, also "fork" could be confused with the corresponding function. Also it seems important to point the name of the referenced fork in the symbol. Note: the old --enable-incompatible-fork-abi command is retained for compatibility, although it should be considered deprecated. --- libavcodec/imgconvert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/imgconvert.c') diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index a2bcdbcca7..1835e00fbe 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){ -- cgit v1.2.3