diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-26 12:22:05 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-26 12:22:05 +0200 |
| commit | 244422cc949c03fc23b251006b58d82555526483 (patch) | |
| tree | 27af837e5042ee5e18c4ecf41ffee25750c42cd3 | |
| parent | 37bbf2317b0a485d1bb530e37f5fb6480b9e60a9 (diff) | |
| parent | d1df0f3a2242edf4add833467aec84f3285079be (diff) | |
Merge branch 'master' into 0.11
| -rw-r--r-- | docs/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/README b/docs/README index e1ece70..e35fc7c 100644 --- a/docs/README +++ b/docs/README @@ -117,7 +117,7 @@ can build simple server applications with it. The object that can create such pipeline is called a GstRTSPMediaFactory object. The default implementation of GstRTSPMediaFactory allows you to easily create - GStreamer pipelines using the gst-launch syntax. It possible to create a + GStreamer pipelines using the gst-launch syntax. It is possible to create a GstRTSPMediaFactory subclass that uses different methods for constructing pipelines. @@ -171,7 +171,7 @@ can build simple server applications with it. The GstRTSPMediaFactory is responsible for creating and caching GstRTSPMedia objects. - A freshly created GstRTSPMedia object from the factory initialy only contains a + A freshly created GstRTSPMedia object from the factory initially only contains a GstElement containing the elements to produce the RTP streams for the media and a GArray of GstRTSPMediaStream objects describing the payloader and its source pad. The media is unprepared in this state. |