[GRASS-SVN] r53852 - grass/trunk

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-17 03:27:34 -0800 (Sat, 17 Nov 2012)
New Revision: 53852

Modified:
   grass/trunk/configure
   grass/trunk/configure.in
Log:
configure: fix ffmpeg switch - replace deprecated fns avcodec_init() and av_set_parameters()
           see http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7221139ba0486c24afeac1f41ba97c75f58046b9


Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2012-11-17 10:38:24 UTC (rev 53851)
+++ grass/trunk/configure	2012-11-17 11:27:34 UTC (rev 53852)
@@ -8850,9 +8850,9 @@
 
 
 
-echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:8855: checking for avcodec_init in -lavcodec" >&5
-ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for avcodec_register in -lavcodec""... $ac_c" 1>&6
+echo "configure:8855: checking for avcodec_register in -lavcodec" >&5
+ac_lib_var=`echo avcodec'_'avcodec_register | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavcodec $FFMPEGLIB  $LIBS"
@@ -8862,10 +8862,10 @@
 /* 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 avcodec_init();
+char avcodec_register();
 
 int main() {
-avcodec_init()
+avcodec_register()
 ; return 0; }
 EOF
 if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8886,9 +8886,9 @@
 else
   echo "$ac_t""no" 1>&6
 
-echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:8891: checking for avcodec_init in -lavcodec" >&5
-ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for avcodec_register in -lavcodec""... $ac_c" 1>&6
+echo "configure:8891: checking for avcodec_register in -lavcodec" >&5
+ac_lib_var=`echo avcodec'_'avcodec_register | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavcodec $FFMPEGLIB $MATHLIB $LIBS"
@@ -8898,10 +8898,10 @@
 /* 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 avcodec_init();
+char avcodec_register();
 
 int main() {
-avcodec_init()
+avcodec_register()
 ; return 0; }
 EOF
 if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8948,9 +8948,9 @@
 
 
 
-echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:8953: checking for av_set_parameters in -lavformat" >&5
-ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
+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_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB  $LIBS"
@@ -8960,10 +8960,10 @@
 /* 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 av_set_parameters();
+char avformat_write_header();
 
 int main() {
-av_set_parameters()
+avformat_write_header()
 ; 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 @@
 else
   echo "$ac_t""no" 1>&6
 
-echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:8989: checking for av_set_parameters in -lavformat" >&5
-ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
+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_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
@@ -8996,10 +8996,10 @@
 /* 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 av_set_parameters();
+char avformat_write_header();
 
 int main() {
-av_set_parameters()
+avformat_write_header()
 ; return 0; }
 EOF
 if { (eval echo configure:9006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2012-11-17 10:38:24 UTC (rev 53851)
+++ grass/trunk/configure.in	2012-11-17 11:27:34 UTC (rev 53852)
@@ -1139,8 +1139,8 @@
 LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
 
 LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
-LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $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)
 
 fi # $USE_FFMPEG