summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2006-12-12 22:31:46 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-12-12 22:31:46 +0000
commite519b02c108a6922ff0e9a12b74ea7a7fbcf7bf1 (patch)
tree56a7e139d22371d8deb528cc9cb2446deaec3f10 /ffmpeg.c
parentfc53da2037b21096dc2b740e044fd1f75d4cc971 (diff)
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 7293 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 4fe908d1a0..cdc78ea5d2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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;