diff options
author | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-12-13 08:45:36 +0000 |
---|---|---|
committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-12-13 08:45:36 +0000 |
commit | f58f4ce19d37cd754ffc577906b619a083b03191 (patch) | |
tree | 9891e418cc4c983cd16ada49819a31634abce399 /ffmpeg.c | |
parent | 83c547a4a14976ea2a5e51273a2ef372aca71044 (diff) | |
download | ffmpeg-streaming-f58f4ce19d37cd754ffc577906b619a083b03191.zip ffmpeg-streaming-f58f4ce19d37cd754ffc577906b619a083b03191.tar.gz |
Original X11 device demuxer patch from Clemens Fruhwirth
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
structure for libavformat registration is renamed to
match build system integration.
Originally committed as revision 7302 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -3234,6 +3234,10 @@ static void prepare_grab(void) if (has_video) { AVInputFormat *fmt1; +#warning FIXME: find a better interface + if(!strncmp(video_device,"x11:",4)) { + video_grab_format="x11grab"; + } fmt1 = av_find_input_format(video_grab_format); vp->device = video_device; vp->channel = video_channel; |