Mercurial > mplayer.hg
comparison configure @ 32834:4224bc9b72ca
Adjust build system to reflect merge of libavcore into libavutil in FFmpeg.
patch by Johan Andersson, j i19 se
| author | diego |
|---|---|
| date | Thu, 17 Feb 2011 11:15:19 +0000 |
| parents | 096818ca3aa0 |
| children | b5f21d533644 |
comparison
equal
deleted
inserted
replaced
| 32833:c4891d10ddbb | 32834:4224bc9b72ca |
|---|---|
| 6860 echocheck "FFmpeg" | 6860 echocheck "FFmpeg" |
| 6861 test -d ffmpeg/libavutil || | 6861 test -d ffmpeg/libavutil || |
| 6862 die "MPlayer will not compile without libavutil in the source tree." | 6862 die "MPlayer will not compile without libavutil in the source tree." |
| 6863 ffmpeg=no | 6863 ffmpeg=no |
| 6864 if test "$ffmpeg_a" = auto ; then | 6864 if test "$ffmpeg_a" = auto ; then |
| 6865 test -d ffmpeg/libavcore && ffmpeg_a=yes && ffmpeg=yes && extra_cflags="$extra_cflags -DFF_API_MAX_STREAMS=0" | 6865 test -d ffmpeg/libavutil && ffmpeg_a=yes && ffmpeg=yes && extra_cflags="$extra_cflags -DFF_API_MAX_STREAMS=0" |
| 6866 elif test "$ffmpeg_so" = auto ; then | 6866 elif test "$ffmpeg_so" = auto ; then |
| 6867 ffmpeg_so=no | 6867 ffmpeg_so=no |
| 6868 if $_pkg_config --exists libavcore ; then | 6868 if $_pkg_config --exists libavutil ; then |
| 6869 inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil libavcore) | 6869 inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil) |
| 6870 _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil libavcore) | 6870 _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil) |
| 6871 header_check libavcore/avcore.h $inc_ffmpeg $_ld_tmp && | 6871 header_check libavutil/avutil.h $inc_ffmpeg $_ld_tmp && |
| 6872 extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes | 6872 extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes |
| 6873 elif header_check libavcore/avcore.h -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore $_ld_lm ; then | 6873 elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then |
| 6874 extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore" | 6874 extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil" |
| 6875 ffmpeg_so=yes | 6875 ffmpeg_so=yes |
| 6876 ffmpeg=yes | 6876 ffmpeg=yes |
| 6877 fi | 6877 fi |
| 6878 fi | 6878 fi |
| 6879 | 6879 |