diff options
| author | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-12-12 22:31:46 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-12-12 22:31:46 +0000 |
| commit | e519b02c108a6922ff0e9a12b74ea7a7fbcf7bf1 (patch) | |
| tree | 56a7e139d22371d8deb528cc9cb2446deaec3f10 /libavformat/allformats.c | |
| parent | fc53da2037b21096dc2b740e044fd1f75d4cc971 (diff) | |
| download | ffmpeg-e519b02c108a6922ff0e9a12b74ea7a7fbcf7bf1.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 7293 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index f4b16adffd..3ef9bc3238 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -166,6 +166,7 @@ void av_register_all(void) REGISTER_DEMUXER (WSAUD, wsaud); REGISTER_DEMUXER (WSVQA, wsvqa); REGISTER_DEMUXER (WV, wv); + REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device); REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe); #ifdef CONFIG_PROTOCOLS |