--- configure.in~	2012-05-31 03:04:14.000000000 +0000
+++ configure.in	2012-05-31 03:05:11.000000000 +0000
@@ -419,7 +419,7 @@
 static_avformat=$static_avcodec
 ac_my_avformat_libs="-lz"
 test x`(uname -s)` = xSunOS && ac_my_avformat_libs="-lz -lnsl -lsocket"
-AC_CHECK_LIB_STATIC(avformat, av_write_header,,[unset ac_cv_lib_avformat_av_write_header ; static_avformat=no ; AC_CHECK_LIB(avformat, av_write_header,,,[$ac_my_avformat_libs])],[$ac_my_avformat_libs])
+AC_CHECK_LIB_STATIC(avformat, avformat_write_header,,[unset ac_cv_lib_avformat_avformat_write_header ; static_avformat=no ; AC_CHECK_LIB(avformat, avformat_write_header,,,[$ac_my_avformat_libs])],[$ac_my_avformat_libs])
 
 # if avcodec is linked statically, avdevice should, too
 static_avdevice=$static_avcodec
@@ -428,7 +428,7 @@
 AC_CHECK_LIB_STATIC(avdevice, avdevice_register_all,,[unset ac_cv_lib_avdevice_avdevice_register_all ; static_avdevice=no ; AC_CHECK_LIB(avdevice, avdevice_register_all,,,[$ac_my_avdevice_libs])],[$ac_my_avdevice_libs])
 
 # only use ffmpeg if ALL required libs are present
-if ( `test x$ac_cv_lib_avcodec_avcodec_encode_video = xyes -a x$ac_cv_lib_avformat_av_write_header = xyes -a x$ac_cv_lib_avutil_av_rescale = xyes -a x$ac_cv_lib_swscale_sws_scale = xyes` ) ; then
+if ( `test x$ac_cv_lib_avcodec_avcodec_encode_video = xyes -a x$ac_cv_lib_avformat_avformat_write_header = xyes -a x$ac_cv_lib_avutil_av_rescale = xyes -a x$ac_cv_lib_swscale_sws_scale = xyes` ) ; then
     ac_cv_lib_avcodec_avcodec_encode_video=yes
 else
     ac_cv_lib_avcodec_avcodec_encode_video=no