virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

There were two files, libavformat/grab.c and libavformat/grab_bktr.c declaring

Browse Source 
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
This commit is contained in:
Diego Biurrun 2007-04-03 21:09:36 +00:00
parent 3d18b282e0
commit 3af6d5cf2f
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -689,7 +689,8 @@ rtp_muxer_deps="network"
rtsp_demuxer_deps="network" rtsp_demuxer_deps="network"
sdp_demuxer_deps="network" sdp_demuxer_deps="network"
v4l2_demuxer_deps="v4l2" v4l2_demuxer_deps="v4l2"
video_grab_device_demuxer_deps_any="v4l bktr" video_grab_bktr_demuxer_deps="bktr"
video_grab_v4l_demuxer_deps="v4l"
x11_grab_device_demuxer_deps="x11grab" x11_grab_device_demuxer_deps="x11grab"
ffplay_deps="sdl" ffplay_deps="sdl"

9
libavformat/Makefile
View File

@ -144,13 +144,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
OBJS+= framehook.o OBJS+= framehook.o
ifeq ($(CONFIG_V4L),yes) OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER) += grab.o
OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER) += grab_bktr.o
endif
ifeq ($(CONFIG_BKTR),yes)
OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
endif
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)

3
libavformat/allformats.c
View File

@ -147,7 +147,8 @@ void av_register_all(void)
REGISTER_DEMUXER (TTA, tta); REGISTER_DEMUXER (TTA, tta);
REGISTER_DEMUXER (V4L2, v4l2); REGISTER_DEMUXER (V4L2, v4l2);
REGISTER_DEMUXER (VC1, vc1); REGISTER_DEMUXER (VC1, vc1);
REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device); REGISTER_DEMUXER (VIDEO_GRAB_BKTR, video_grab_bktr);
REGISTER_DEMUXER (VIDEO_GRAB_V4L, video_grab_v4l);
REGISTER_DEMUXER (VMD, vmd); REGISTER_DEMUXER (VMD, vmd);
REGISTER_MUXDEMUX(VOC, voc); REGISTER_MUXDEMUX(VOC, voc);
REGISTER_MUXDEMUX(WAV, wav); REGISTER_MUXDEMUX(WAV, wav);

3
libavformat/allformats.h
View File

@ -99,7 +99,8 @@ extern AVInputFormat tiertexseq_demuxer;
extern AVInputFormat tta_demuxer; extern AVInputFormat tta_demuxer;
extern AVInputFormat v4l2_demuxer; extern AVInputFormat v4l2_demuxer;
extern AVInputFormat vc1_demuxer; extern AVInputFormat vc1_demuxer;
extern AVInputFormat video_grab_device_demuxer; extern AVInputFormat video_grab_bktr_demuxer;
extern AVInputFormat video_grab_v4l_demuxer;
extern AVInputFormat vmd_demuxer; extern AVInputFormat vmd_demuxer;
extern AVInputFormat voc_demuxer; extern AVInputFormat voc_demuxer;
extern AVInputFormat wav_demuxer; extern AVInputFormat wav_demuxer;

2
libavformat/grab.c
View File

@ -375,7 +375,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0; return 0;
} }
AVInputFormat video_grab_device_demuxer = { AVInputFormat video_grab_v4l_demuxer = {
"video4linux", "video4linux",
"video grab", "video grab",
sizeof(VideoData), sizeof(VideoData),

2
libavformat/grab_bktr.c
View File

@ -308,7 +308,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0; return 0;
} }
AVInputFormat video_grab_device_demuxer = { AVInputFormat video_grab_bktr_demuxer = {
"bktr", "bktr",
"video grab", "video grab",
sizeof(VideoData), sizeof(VideoData),