diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 22 |
2 files changed, 13 insertions, 13 deletions
@@ -920,8 +920,8 @@ PARSER_LIST=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' "$source_path/ BSF_LIST=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' "$source_path/libavcodec/allcodecs.c"` MUXER_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavformat/allformats.c"` DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavformat/allformats.c"` -INDEV_LIST=`sed -n 's/^[^#]*_IN.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavdevice/alldevices.c"` -OUTDEV_LIST=`sed -n 's/^[^#]*OUTDEV.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavdevice/alldevices.c"` +OUTDEV_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavdevice/alldevices.c"` +INDEV_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavdevice/alldevices.c"` PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"` enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST $PROTOCOL_LIST $BSF_LIST $INDEV_LIST $OUTDEV_LIST diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index fd7223a915..f97dc73d91 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -20,13 +20,13 @@ #include "avformat.h" #include "avdevice.h" -#define REGISTER_OUTDEV(X,x) { \ +#define REGISTER_MUXER(X,x) { \ extern AVOutputFormat x##_muxer; \ if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer); } -#define REGISTER_INDEV(X,x) { \ +#define REGISTER_DEMUXER(X,x) { \ extern AVInputFormat x##_demuxer; \ if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } -#define REGISTER_INOUTDEV(X,x) REGISTER_INDEV(X,x); REGISTER_OUTDEV(X,x) +#define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x) void avdevice_register_all(void) { @@ -37,14 +37,14 @@ void avdevice_register_all(void) inited = 1; /* devices */ - REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos); - REGISTER_INDEV (BKTR, bktr); - REGISTER_INDEV (DV1394, dv1394); - REGISTER_INOUTDEV (OSS, oss); - REGISTER_INDEV (V4L2, v4l2); - REGISTER_INDEV (V4L, v4l); - REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); + REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos); + REGISTER_DEMUXER (BKTR, bktr); + REGISTER_DEMUXER (DV1394, dv1394); + REGISTER_MUXDEMUX (OSS, oss); + REGISTER_DEMUXER (V4L2, v4l2); + REGISTER_DEMUXER (V4L, v4l); + REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device); /* external libraries */ - REGISTER_INDEV (LIBDC1394, libdc1394); + REGISTER_DEMUXER (LIBDC1394, libdc1394); } |