diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-06-29 18:49:15 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-06-29 18:49:15 +0000 |
| commit | 38e54a75abf2dbf41773f584a0afc6492baa099a (patch) | |
| tree | f193d17e86296bcaf0592d34dc6f3e23362970ba /libavdevice/alldevices.c | |
| parent | d004179e197fc9be7fbefa7c38c09984517cbfed (diff) | |
| download | ffmpeg-38e54a75abf2dbf41773f584a0afc6492baa099a.tar.gz | |
Make the configure script select the input/output devices using
--enable-indev, --enable-outdev rather than --enable-demuxer,
--enable-muxer as before, same for disabling them.
Originally committed as revision 19293 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice/alldevices.c')
| -rw-r--r-- | libavdevice/alldevices.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 7efc42a897..1947eee88f 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -27,13 +27,13 @@ unsigned avdevice_version(void) return LIBAVDEVICE_VERSION_INT; } -#define REGISTER_MUXER(X,x) { \ +#define REGISTER_OUTDEV(X,x) { \ extern AVOutputFormat x##_muxer; \ - if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); } -#define REGISTER_DEMUXER(X,x) { \ + if(CONFIG_##X##_OUTDEV) av_register_output_format(&x##_muxer); } +#define REGISTER_INDEV(X,x) { \ extern AVInputFormat x##_demuxer; \ - if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } -#define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x) + if(CONFIG_##X##_INDEV) av_register_input_format(&x##_demuxer); } +#define REGISTER_INOUTDEV(X,x) REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x) void avdevice_register_all(void) { @@ -44,17 +44,17 @@ void avdevice_register_all(void) initialized = 1; /* devices */ - REGISTER_MUXDEMUX (ALSA, alsa); - 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); - REGISTER_DEMUXER (VFWCAP, vfwcap); - REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device); + REGISTER_INOUTDEV (ALSA, alsa); + REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos); + REGISTER_INDEV (BKTR, bktr); + REGISTER_INDEV (DV1394, dv1394); + REGISTER_INDEV (JACK, jack); + REGISTER_INOUTDEV (OSS, oss); + REGISTER_INDEV (V4L2, v4l2); + REGISTER_INDEV (V4L, v4l); + REGISTER_INDEV (VFWCAP, vfwcap); + REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); /* external libraries */ - REGISTER_DEMUXER (LIBDC1394, libdc1394); + REGISTER_INDEV (LIBDC1394, libdc1394); } |