diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-07-01 20:47:09 +0400 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-07-03 15:16:33 +0400 |
| commit | 5efbeae38cdcf8ed099be06f59fb422b5004e163 (patch) | |
| tree | 353af057f3746207ef8f3eb437039b60a5219d36 /libavcodec | |
| parent | 7c71ef4f1727e6a59b7266ef04be1076b6363b61 (diff) | |
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.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 2 | ||||
| -rw-r--r-- | libavcodec/vdpau.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8cac2cf8b9..3f3352f535 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 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){ diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index f5b2317807..a8d708cd3b 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 |