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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index fd2ac2a29f..c76f902701 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -123,6 +123,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o OBJS-$(CONFIG_WV_DEMUXER) += wv.o +OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o |