Mercurial > mplayer.hg
changeset 36880:c4b770eab978
Refine compilation against shared FFmpeg.
| author | reimar |
|---|---|
| date | Wed, 05 Mar 2014 18:33:20 +0000 |
| parents | 8c1bbe0536ea |
| children | 36f6023a9127 |
| files | configure |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Mar 05 03:17:56 2014 +0000 +++ b/configure Wed Mar 05 18:33:20 2014 +0000 @@ -1523,7 +1523,7 @@ fi fi -if ! test -e ffmpeg ; then +if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" read tmp if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then @@ -7098,6 +7098,7 @@ fi if test "$ffmpeg" = yes; then + header_check libavutil/x86/asm.h || die "libavutil/x86/asm.h header is required for shared FFmpeg" def_ffmpeg='#define CONFIG_FFMPEG 1' if test "$ffmpeg_a" = yes ; then codecmodules="ffmpeg(internal) $codecmodules"