Explorar o código

configure: ffmpeg don't use new and deprecated fns for LOC_CHECK_LIB

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53881 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa %!s(int64=12) %!d(string=hai) anos
pai
achega
dad9f4f56c
Modificáronse 2 ficheiros con 11 adicións e 11 borrados
  1. 10 10
      configure
  2. 1 1
      configure.in

+ 10 - 10
configure

@@ -8948,9 +8948,9 @@ LDFLAGS="$FFMPEGLIBPATH $LDFLAGS"
 
 
 
-echo $ac_n "checking for avformat_write_header in -lavformat""... $ac_c" 1>&6
-echo "configure:8953: checking for avformat_write_header in -lavformat" >&5
-ac_lib_var=`echo avformat'_'avformat_write_header | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for avformat_alloc_context in -lavformat""... $ac_c" 1>&6
+echo "configure:8953: checking for avformat_alloc_context in -lavformat" >&5
+ac_lib_var=`echo avformat'_'avformat_alloc_context | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB  $LIBS"
@@ -8960,10 +8960,10 @@ cat > conftest.$ac_ext <<EOF
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char avformat_write_header();
+char avformat_alloc_context();
 
 int main() {
-avformat_write_header()
+avformat_alloc_context()
 ; return 0; }
 EOF
 if { (eval echo configure:8970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8984,9 +8984,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 
-echo $ac_n "checking for avformat_write_header in -lavformat""... $ac_c" 1>&6
-echo "configure:8989: checking for avformat_write_header in -lavformat" >&5
-ac_lib_var=`echo avformat'_'avformat_write_header | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for avformat_alloc_context in -lavformat""... $ac_c" 1>&6
+echo "configure:8989: checking for avformat_alloc_context in -lavformat" >&5
+ac_lib_var=`echo avformat'_'avformat_alloc_context | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
@@ -8996,10 +8996,10 @@ cat > conftest.$ac_ext <<EOF
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char avformat_write_header();
+char avformat_alloc_context();
 
 int main() {
-avformat_write_header()
+avformat_alloc_context()
 ; return 0; }
 EOF
 if { (eval echo configure:9006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

+ 1 - 1
configure.in

@@ -1140,7 +1140,7 @@ LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
 
 LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
 LOC_CHECK_LIBS(avcodec, avcodec_register, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-LOC_CHECK_LIBS(avformat, avformat_write_header, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+LOC_CHECK_LIBS(avformat, avformat_alloc_context, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
 
 fi # $USE_FFMPEG