diff options
| author | Comment <tim@gray.(none)> | 2013-11-02 16:13:41 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-11-02 16:13:41 +0000 |
| commit | 510a5218d5e981db3dde9ed31ddc6f732ed6a22a (patch) | |
| tree | b9d09c4dbdefed1ec693e0492841cde426ef6643 /ffmpeg/config.mak | |
| parent | 8864f5da9649c176e472a7fb8913dd8114deec54 (diff) | |
| parent | eaccb1437465c6aa49e1d5511876852543e3b0fa (diff) | |
merge branch
Diffstat (limited to 'ffmpeg/config.mak')
| -rw-r--r-- | ffmpeg/config.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ffmpeg/config.mak b/ffmpeg/config.mak index 1253f77..24ec1b6 100644 --- a/ffmpeg/config.mak +++ b/ffmpeg/config.mak @@ -89,7 +89,7 @@ LIBS-ffplay= CFLAGS-ffplay= ZLIB=-lz LIB_INSTALL_EXTRA_CMD=$$(RANLIB) "$(LIBDIR)/$(LIBNAME)" -EXTRALIBS=-ldl -lXfixes -lXext -lX11 -lxvidcore -lx264 -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lschroedinger-1.0 -lmp3lame -lfaac -lm -pthread -lz +EXTRALIBS=-ldl -lXfixes -lXext -lX11 -ljack -lasound -lxvidcore -lx264 -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lschroedinger-1.0 -lmp3lame -lfaac -lm -pthread -lz COMPAT_OBJS= EXEOBJS= INSTALL=install @@ -268,7 +268,7 @@ HAVE_TRUNCF=yes HAVE_ACCESS=yes !HAVE_ALIGNED_MALLOC=yes HAVE_ALIGNED_STACK=yes -!HAVE_ALSA_ASOUNDLIB_H=yes +HAVE_ALSA_ASOUNDLIB_H=yes !HAVE_ALTIVEC_H=yes HAVE_ARPA_INET_H=yes !HAVE_ASM_MOD_Q=yes @@ -319,7 +319,7 @@ HAVE_GNU_AS=yes HAVE_INET_ATON=yes !HAVE_IO_H=yes HAVE_ISATTY=yes -!HAVE_JACK_PORT_GET_LATENCY_RANGE=yes +HAVE_JACK_PORT_GET_LATENCY_RANGE=yes !HAVE_KBHIT=yes !HAVE_LDBRX=yes !HAVE_LIBDC1394_1=yes @@ -1429,13 +1429,13 @@ CONFIG_MOVIE_FILTER=yes !CONFIG_WMV3_DXVA2_HWACCEL=yes !CONFIG_WMV3_VAAPI_HWACCEL=yes !CONFIG_WMV3_VDPAU_HWACCEL=yes -!CONFIG_ALSA_INDEV=yes +CONFIG_ALSA_INDEV=yes !CONFIG_BKTR_INDEV=yes !CONFIG_DSHOW_INDEV=yes CONFIG_DV1394_INDEV=yes CONFIG_FBDEV_INDEV=yes !CONFIG_IEC61883_INDEV=yes -!CONFIG_JACK_INDEV=yes +CONFIG_JACK_INDEV=yes CONFIG_LAVFI_INDEV=yes !CONFIG_OPENAL_INDEV=yes CONFIG_OSS_INDEV=yes @@ -1573,7 +1573,7 @@ CONFIG_WTV_MUXER=yes CONFIG_WV_MUXER=yes CONFIG_YUV4MPEGPIPE_MUXER=yes !CONFIG_LIBNUT_MUXER=yes -!CONFIG_ALSA_OUTDEV=yes +CONFIG_ALSA_OUTDEV=yes !CONFIG_CACA_OUTDEV=yes CONFIG_OSS_OUTDEV=yes !CONFIG_SDL_OUTDEV=yes |