From 198224ef585541d4e82728fc3c60e132b8cee29c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Tue, 17 Jun 2008 10:14:47 +0000
Subject: [PATCH] gst/rtsp/URLS: Some more urls.

Original commit message from CVS:
* gst/rtsp/URLS:
Some more urls.
* gst/smpte/barboxwipes.c:
Add a comment
* tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh:
Fix typo, add audioresample to the pipeline.
---
 ChangeLog                                           | 11 +++++++++++
 gst/rtsp/URLS                                       |  3 +++
 gst/smpte/barboxwipes.c                             |  3 +++
 tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh |  4 ++--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 633d8fa2d4..8e11ac6fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-17  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/rtsp/URLS:
+	Some more urls.
+
+	* gst/smpte/barboxwipes.c:
+	Add a comment
+
+	* tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh:
+	Fix typo, add audioresample to the pipeline.
+
 2008-06-17  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* ext/libmng/Makefile.am:
diff --git a/gst/rtsp/URLS b/gst/rtsp/URLS
index 653fe1dc16..cb000bab3e 100644
--- a/gst/rtsp/URLS
+++ b/gst/rtsp/URLS
@@ -27,3 +27,6 @@ H264/MPA
 REAL:
   rtsp://213.254.239.61/farm/*/encoder/tagesschau/live1high.rm
   rtsp://64.192.137.105:554/real.amazon-de.eu2/phononet/B/0/0/0/H/W/Y/4/K/S/01.01.rm?cloakport=80,554,7070
+
+  rtsp://211.89.225.1/encoder/cnr7_p
+  rtsp://stream2.visual.cz/broadcast/ct/CT24-High.rm
diff --git a/gst/smpte/barboxwipes.c b/gst/smpte/barboxwipes.c
index 173355eac1..b8f00f7fc4 100644
--- a/gst/smpte/barboxwipes.c
+++ b/gst/smpte/barboxwipes.c
@@ -658,6 +658,9 @@ gst_wipe_triangles_draw (GstMask * mask)
   }
 }
 
+/* see also:
+ * http://www.w3c.rl.ac.uk/pasttalks/slidemaker/XML_Multimedia/htmls/transitions.html
+ */
 static const GstMaskDefinition definitions[] = {
   {1, "bar-wipe-lr",
         "A bar moves from left to right",
diff --git a/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh b/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh
index b30787f494..d42b5126f2 100755
--- a/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh
+++ b/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh
@@ -57,10 +57,10 @@ VRTPSINK="udpsink port=5000 host=$DEST ts-offset=$VOFFSET name=vrtpsink"
 VRTCPSINK="udpsink port=5001 host=$DEST sync=false async=false name=vrtcpsink"
 VRTCPSRC="udpsrc port=5005 name=vrtpsrc"
 
-# PCMA encode from an the source
+# PCMA encode from the source
 AELEM="alsasrc"
 #AELEM="audiotestsrc is-live=1"
-ASOURCE="$AELEM ! queue ! audioconvert"
+ASOURCE="$AELEM ! queue ! audioresample ! audioconvert"
 AENC="alawenc ! rtppcmapay"
 
 ARTPSINK="udpsink port=5002 host=$DEST ts-offset=$AOFFSET name=artpsink"