diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-08 18:56:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-08 19:07:17 +0200 |
| commit | b7e2899655da8f790c77573bc4a41eee37fbbcde (patch) | |
| tree | 4e07aa431170c327304496cc2f7057f314223981 /configure | |
| parent | e1a8392cae584ddce6a92d88bda47e7f366769cf (diff) | |
| download | mpv-b7e2899655da8f790c77573bc4a41eee37fbbcde.tar.bz2 mpv-b7e2899655da8f790c77573bc4a41eee37fbbcde.tar.xz | |
configure: abort if FFmpeg libraries are not found
Abort if FFmpeg libraries are not found unless --disable-ffmpeg was
explicitly specified. Note that even if you disable FFmpeg, libavutil
and libswscale are still required and you'll need to add linker flags
for them manually; I didn't try to clean up that case (few people
will want to do that).
Also fix the fallback test used if pkg-config doesn't find the
libraries: fix wrong header name and drop forced -lavcore which isn't
present in all FFmpeg versions. This shouldn't make a difference for
normal use since the pkg-config test should succeed if the libraries
are available.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -6077,9 +6077,11 @@ if test "$ffmpeg" = auto ; then extra_ldflags="$extra_ldflags $_ld_tmp" extra_cflags="$extra_cflags $inc_ffmpeg" ffmpeg=yes - elif header_check libavcore/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then - extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore" + elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then + extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil" ffmpeg=yes + else + die "Unable to find development files for some of the FFmpeg libraries above. Aborting. If you really mean to compile without FFmpeg support use --disable-ffmpeg." fi fi |