diff options
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/Makefile | 1 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 2 | ||||
| -rw-r--r-- | libavdevice/avdevice.h | 4 |
3 files changed, 0 insertions, 7 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index d7806ea435..520e7b8daf 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -29,7 +29,6 @@ OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o -OBJS-$(CONFIG_V4L_INDEV) += v4l.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index ace7c17ddf..161c3b4db0 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -51,9 +51,7 @@ void avdevice_register_all(void) REGISTER_OUTDEV (SDL, sdl); REGISTER_INOUTDEV (SNDIO, sndio); REGISTER_INDEV (V4L2, v4l2); -#if FF_API_V4L REGISTER_INDEV (V4L, v4l); -#endif REGISTER_INDEV (VFWCAP, vfwcap); REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index b001887b2f..5abf9f523f 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -56,10 +56,6 @@ LIBAVDEVICE_VERSION_MICRO) #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT -#ifndef FF_API_V4L -#define FF_API_V4L (LIBAVDEVICE_VERSION_MAJOR < 54) -#endif - /** * Return the LIBAVDEVICE_VERSION_INT constant. */ |