Mercurial > mplayer.hg
changeset 35037:80d176c1fa17
Fix compilation with latest FFmpeg.
| author | cehoyos |
|---|---|
| date | Fri, 31 Aug 2012 13:47:36 +0000 |
| parents | 230b0880be9b |
| children | 3b57273e1301 |
| files | configure |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Aug 30 12:25:02 2012 +0000 +++ b/configure Fri Aug 31 13:47:36 2012 +0000 @@ -8401,12 +8401,13 @@ item=$(echo $2 | tr '[a-z]' '[A-Z]') _nprefix=$4; _defineprefix=$3; +_postfix=$5; test -z "$_nprefix" && _nprefix='CONFIG' for part in $list; do if $(echo $item | grep -q -E "(^| )$part($| )"); then - echo "${_defineprefix}define ${_nprefix}_$part 1" + echo "${_defineprefix}define ${_nprefix}_${part}${_postfix} 1" else - echo "${_defineprefix}define ${_nprefix}_$part 0" + echo "${_defineprefix}define ${_nprefix}_${part}${_postfix} 0" fi done } @@ -8552,6 +8553,7 @@ $(ff_config_enable "$arch_all" "$arch" "#" "ARCH") $(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH") $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE") +$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_INLINE") /* Blu-ray/DVD/VCD/CD */ @@ -8955,7 +8957,7 @@ echo "%define CONFIG_GPL 1" >> "$TMPS" echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS" echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS" -echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" +echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_EXTERNAL")" >> "$TMPS" echo "$(ff_config_enable "$yasm_features_all" "$yasm_features" "%" "HAVE")" >> "$TMPS" cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm