diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-03 21:09:36 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-03 21:09:36 +0000 |
| commit | 3af6d5cf2f790f7ca5bc002e937c6322a71559f8 (patch) | |
| tree | 18577d5105be88b52967819652dad500aa25b0f6 /libavformat/Makefile | |
| parent | 3d18b282e0ecf21b02f3210446f6081b40fc4074 (diff) | |
There were two files, libavformat/grab.c and libavformat/grab_bktr.c declaring
the video_grab_device_demuxer AVInputFormat. Use two different names for the
AVInputFormats to reduce confusion and remove ugliness from the Makefile.
Originally committed as revision 8619 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 3d12752c22..01e68a9e0c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -144,13 +144,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o OBJS+= framehook.o -ifeq ($(CONFIG_V4L),yes) -OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o -endif - -ifeq ($(CONFIG_BKTR),yes) -OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o -endif +OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER) += grab.o +OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER) += grab_bktr.o EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) |