diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 23:52:14 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 23:52:14 +0400 |
commit | 8e702bd3a8f5a4271590ab5aa38a41087ceaab1b (patch) | |
tree | b250e79863728fe064c327702e9a2eb9dce489af /libavutil | |
parent | c9afeda55ef29534d7b565bd613122227e046d5b (diff) | |
parent | d64341e498fa46c6cf4c23d408177d7489559654 (diff) |
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
configure: Prefix libc-related variables with "libc_"
Conflicts:
libavdevice/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index cf3420c6bb..9c5546f3b1 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -211,7 +211,7 @@ void avpriv_report_missing_feature(void *avc, void avpriv_request_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); -#if HAVE_MSVCRT +#if HAVE_LIBC_MSVCRT #define avpriv_open ff_open #endif |