diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2001-03-01 22:36:26 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2001-03-01 22:36:26 +0000 |
commit | 90ac5da6d6fe07dc902502cfed96a779b1717e23 (patch) | |
tree | 8744445209d6438a7be507e3c9bbfcbb3f76f993 /docs/gst/gstreamer-docs.sgml | |
parent | 81197b7c0663cf731a4b270fcae7b08e76f2572d (diff) |
Merge with the main trunk.BRANCH-AUTOPLUG2-20010301
Original commit message from CVS:
Merge with the main trunk.
GstPlay needed some changes for the dynamic pads in the avidecoder since
the new autoplugger doesn't know about the outher elements. The next
version of the autoplugger will also handle the audfio/videosink connections
and will do a complete end-to-end autoplugging.
Diffstat (limited to 'docs/gst/gstreamer-docs.sgml')
-rw-r--r-- | docs/gst/gstreamer-docs.sgml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml index 9f52596507..09ad84ab3e 100644 --- a/docs/gst/gstreamer-docs.sgml +++ b/docs/gst/gstreamer-docs.sgml @@ -30,7 +30,6 @@ <!entity GstFakeSrc SYSTEM "sgml/gstfakesrc.sgml"> <!entity GstFakeSink SYSTEM "sgml/gstfakesink.sgml"> <!entity GstDiskSrc SYSTEM "sgml/gstdisksrc.sgml"> -<!entity GstAsyncDiskSrc SYSTEM "sgml/gstasyncdisksrc.sgml"> <!entity GstHttpSrc SYSTEM "sgml/gsthttpsrc.sgml"> <!entity GstFdSrc SYSTEM "sgml/gstfdsrc.sgml"> <!entity GstAudioSrc SYSTEM "sgml/gstaudiosrc.sgml"> @@ -125,7 +124,6 @@ with some more specialized elements.</para> &GstFakeSink; &GstDiskSrc; - &GstAsyncDiskSrc; &GstHttpSrc; &GstAudioSrc; |