Implement JACK input device.

Patch by Olivier Guilyardi list samalyse com.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18322 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

configure

@@ -1112,6 +1112,8 @@ avisynth_demuxer_deps="avisynth"
 bktr_demuxer_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 dirac_demuxer_deps="dirac_parser"
 dv1394_demuxer_deps="dv1394 dv_demuxer"
+jack_demuxer_deps="jack_jack_h"
+jack_demuxer_extralibs="-ljack"
 libdc1394_demuxer_deps="libdc1394"
 libnut_demuxer_deps="libnut"
 libnut_muxer_deps="libnut"
@@ -2149,6 +2151,8 @@ check_header soundcard.h
 
 check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
 
+check_lib2 jack/jack.h jack_client_open -ljack
+
 # deal with the X11 frame grabber
 enabled x11grab                         &&
 check_header X11/Xlib.h                 &&

doc/general.texi

@@ -653,6 +653,7 @@ performance on systems without hardware floating point support).
 @item BEOS audio        @tab X      @tab X
 @item BKTR              @tab X      @tab
 @item DV1394            @tab X      @tab
+@item JACK              @tab X      @tab
 @item LIBDC1394         @tab X      @tab
 @item OSS               @tab X      @tab X
 @item Video4Linux       @tab X      @tab

libavdevice/Makefile

@@ -12,6 +12,7 @@ OBJS-$(CONFIG_ALSA_DEMUXER)              += alsa-audio-common.o alsa-audio-dec.o
 OBJS-$(CONFIG_ALSA_MUXER)                += alsa-audio-common.o alsa-audio-enc.o
 OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
 OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
+OBJS-$(CONFIG_JACK_DEMUXER)              += jack_audio.o
 OBJS-$(CONFIG_OSS_DEMUXER)               += oss_audio.o
 OBJS-$(CONFIG_OSS_MUXER)                 += oss_audio.o
 OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o

libavdevice/alldevices.c

@@ -48,6 +48,7 @@ void avdevice_register_all(void)
     REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
     REGISTER_DEMUXER  (BKTR, bktr);
     REGISTER_DEMUXER  (DV1394, dv1394);
+    REGISTER_DEMUXER  (JACK, jack);
     REGISTER_MUXDEMUX (OSS, oss);
     REGISTER_DEMUXER  (V4L2, v4l2);
     REGISTER_DEMUXER  (V4L, v4l);

libavdevice/avdevice.h

@@ -20,7 +20,7 @@
 #define AVDEVICE_AVDEVICE_H
 
 #define LIBAVDEVICE_VERSION_MAJOR 52
-#define LIBAVDEVICE_VERSION_MINOR  1
+#define LIBAVDEVICE_VERSION_MINOR  2
 #define LIBAVDEVICE_VERSION_MICRO  0
 
 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \

libavformat/Makefile

@@ -243,6 +243,9 @@ OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
+# libavdevice dependencies
+OBJS-$(CONFIG_JACK_DEMUXER)              += timefilter.o
+
 EXAMPLES  = output
 TESTPROGS = timefilter