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.h | |
| parent | 8864f5da9649c176e472a7fb8913dd8114deec54 (diff) | |
| parent | eaccb1437465c6aa49e1d5511876852543e3b0fa (diff) | |
merge branch
Diffstat (limited to 'ffmpeg/config.h')
| -rw-r--r-- | ffmpeg/config.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ffmpeg/config.h b/ffmpeg/config.h index 8e7ee8d..724480c 100644 --- a/ffmpeg/config.h +++ b/ffmpeg/config.h @@ -147,7 +147,7 @@ #define HAVE_ACCESS 1 #define HAVE_ALIGNED_MALLOC 0 #define HAVE_ALIGNED_STACK 1 -#define HAVE_ALSA_ASOUNDLIB_H 0 +#define HAVE_ALSA_ASOUNDLIB_H 1 #define HAVE_ALTIVEC_H 0 #define HAVE_ARPA_INET_H 1 #define HAVE_ASM_MOD_Q 0 @@ -198,7 +198,7 @@ #define HAVE_INET_ATON 1 #define HAVE_IO_H 0 #define HAVE_ISATTY 1 -#define HAVE_JACK_PORT_GET_LATENCY_RANGE 0 +#define HAVE_JACK_PORT_GET_LATENCY_RANGE 1 #define HAVE_KBHIT 0 #define HAVE_LDBRX 0 #define HAVE_LIBDC1394_1 0 @@ -1308,13 +1308,13 @@ #define CONFIG_WMV3_DXVA2_HWACCEL 0 #define CONFIG_WMV3_VAAPI_HWACCEL 0 #define CONFIG_WMV3_VDPAU_HWACCEL 0 -#define CONFIG_ALSA_INDEV 0 +#define CONFIG_ALSA_INDEV 1 #define CONFIG_BKTR_INDEV 0 #define CONFIG_DSHOW_INDEV 0 #define CONFIG_DV1394_INDEV 1 #define CONFIG_FBDEV_INDEV 1 #define CONFIG_IEC61883_INDEV 0 -#define CONFIG_JACK_INDEV 0 +#define CONFIG_JACK_INDEV 1 #define CONFIG_LAVFI_INDEV 1 #define CONFIG_OPENAL_INDEV 0 #define CONFIG_OSS_INDEV 1 @@ -1452,7 +1452,7 @@ #define CONFIG_WV_MUXER 1 #define CONFIG_YUV4MPEGPIPE_MUXER 1 #define CONFIG_LIBNUT_MUXER 0 -#define CONFIG_ALSA_OUTDEV 0 +#define CONFIG_ALSA_OUTDEV 1 #define CONFIG_CACA_OUTDEV 0 #define CONFIG_OSS_OUTDEV 1 #define CONFIG_SDL_OUTDEV 0 |