Mercurial > mplayer.hg

comparison configure @ 31512:176e30f35c73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert the previous two commits to configure and clarify the res_comment.
author siretart
date Mon, 28 Jun 2010 08:43:05 +0000
parents effd6503b84c
children 7ab5787e625c
comparison
equal deleted inserted replaced
31511:13ca93203358 31512:176e30f35c73
7575 echores "$_libschroedinger_lavc" 7575 echores "$_libschroedinger_lavc"
7576 7576
7577 echocheck "libvpx" 7577 echocheck "libvpx"
7578 if test "$_libvpx_lavc" = auto; then 7578 if test "$_libvpx_lavc" = auto; then
7579 _libvpx_lavc=no 7579 _libvpx_lavc=no
7580 cat > $TMPC << EOF 7580 if test "$_libavcodec_a" != yes; then
7581 res_comment="dynamic linking to libvpx is irrelevant when using dynamic libavcodec"
7582 else
7583 cat > $TMPC << EOF
7581 #include <vpx/vpx_encoder.h> 7584 #include <vpx/vpx_encoder.h>
7582 #include <vpx/vpx_decoder.h> 7585 #include <vpx/vpx_decoder.h>
7583 #include <vpx/vp8dx.h> 7586 #include <vpx/vp8dx.h>
7584 #include <vpx/vp8cx.h> 7587 #include <vpx/vp8cx.h>
7585 struct vpx_codec_ctx decoder; 7588 struct vpx_codec_ctx decoder;
7587 vpx_codec_dec_init(NULL, &vpx_codec_vp8_dx_algo, NULL, 0); 7590 vpx_codec_dec_init(NULL, &vpx_codec_vp8_dx_algo, NULL, 0);
7588 vpx_codec_enc_init(NULL, &vpx_codec_vp8_dx_algo, NULL, 0); 7591 vpx_codec_enc_init(NULL, &vpx_codec_vp8_dx_algo, NULL, 0);
7589 return 0; 7592 return 0;
7590 } 7593 }
7591 EOF 7594 EOF
7592 cc_check -lvpx && _libvpx_lavc=yes && extra_ldflags="$extra_ldflags -lvpx" 7595 cc_check -lvpx && _libvpx_lavc=yes && extra_ldflags="$extra_ldflags -lvpx"
7596 fi
7593 fi 7597 fi
7594 if test "$_libvpx_lavc" = yes ; then 7598 if test "$_libvpx_lavc" = yes ; then
7595 def_libvpx_lavc='#define CONFIG_LIBVPX 1' 7599 def_libvpx_lavc='#define CONFIG_LIBVPX 1'
7596 _libavdecoders="$_libavdecoders LIBVPX_DECODER" 7600 _libavdecoders="$_libavdecoders LIBVPX_DECODER"
7597 _libavencoders="$_libavencoders LIBVPX_ENCODER" 7601 _libavencoders="$_libavencoders LIBVPX_ENCODER"