From d6d7f170431499c3ec079f2fa709373ed64b2275 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Thu, 10 Nov 2005 19:05:38 +0000
Subject: [PATCH] gst/playback/gstplaybasebin.c (prepare_output): Fix format
 string doober.

Original commit message from CVS:
2005-11-10  Andy Wingo  <wingo@pobox.com>

* gst/playback/gstplaybasebin.c (prepare_output): Fix format
string doober.
---
 ChangeLog                           | 14 ++++++++++----
 docs/libs/tmpl/gstcolorbalance.sgml | 11 -----------
 gst/playback/gstplaybasebin.c       |  2 +-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6fd7014c63..9f8cffd98b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-10  Andy Wingo  <wingo@pobox.com>
+
+	* gst/playback/gstplaybasebin.c (prepare_output): Fix format
+	string doober.
+
 2005-11-10  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
@@ -38,10 +43,11 @@
 
 2005-11-10  Thomas Vander Stichele  <thomas at apestaart dot org>
 
-	* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_fixate):
-	  Check if the caps have a fourcc field.  Fixes crash for
-	  gst-launch-0.9 v4lsrc name=source autoprobe=false autoprobe-fps=false 	                 copy-mode=1 device=/dev/video0 ! ffmpegcolorspace !
-	                 "video/x-raw-yuv, format=(fourcc)I420" ! xvimagesink
+	* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_fixate): Check if the caps have
+	  a fourcc field. Fixes crash for gst-launch-0.9 v4lsrc
+	  name=source autoprobe=false autoprobe-fps=false copy-mode=1
+	  device=/dev/video0 ! ffmpegcolorspace ! "video/x-raw-yuv,
+	  format=(fourcc)I420" ! xvimagesink
 
 2005-11-10  Tim-Philipp Müller  <tim at centricular dot net>
 
diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml
index 72db8e83d4..e8795a0dd6 100644
--- a/docs/libs/tmpl/gstcolorbalance.sgml
+++ b/docs/libs/tmpl/gstcolorbalance.sgml
@@ -9,13 +9,11 @@ gstcolorbalance
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -25,15 +23,6 @@ gstcolorbalance
 </para>
 
 
-<!-- ##### SIGNAL GstColorBalance::value-changed ##### -->
-<para>
-
-</para>
-
-@gstcolorbalance: the object which received the signal.
-@arg1: 
-@arg2: 
-
 <!-- ##### STRUCT GstColorBalanceClass ##### -->
 <para>
 
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 25f788bf78..c038fe6b8b 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1410,7 +1410,7 @@ prepare_output (GstPlayBaseBin * play_base_bin)
           (_("You do not have a decoder installed to handle \"%s\".  You might need to install the necessary plugins."), play_base_bin->uri), (NULL));
     } else {
       GST_ELEMENT_ERROR (play_base_bin, STREAM, WRONG_TYPE,
-          (_("\"%s\" is not a media file")), (NULL));
+          (_("\"%s\" is not a media file"), play_base_bin->uri), (NULL));
     }
     return FALSE;
   }