aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vdpau.h
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-07-01 18:47:09 +0200
committerStefano Sabatini <stefasab@gmail.com>2013-07-03 13:16:33 +0200
commit5efbeae38cdcf8ed099be06f59fb422b5004e163 (patch)
tree353af057f3746207ef8f3eb437039b60a5219d36 /libavcodec/vdpau.h
parent7c71ef4f1727e6a59b7266ef04be1076b6363b61 (diff)
downloadandroid_external_ffmpeg-5efbeae38cdcf8ed099be06f59fb422b5004e163.tar.gz
android_external_ffmpeg-5efbeae38cdcf8ed099be06f59fb422b5004e163.tar.bz2
android_external_ffmpeg-5efbeae38cdcf8ed099be06f59fb422b5004e163.zip
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/vdpau.h')
-rw-r--r--libavcodec/vdpau.h4
1 files changed, 2 insertions, 2 deletions
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