From 140c4dd0601a527e4f0ae03860833d4e9edac893 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 30 Jan 2004 03:54:08 +0000 Subject: [PATCH] docs/random/mimetypes: correct Theora information Original commit message from CVS: 2004-01-30 Benjamin Otte * docs/random/mimetypes: correct Theora information * gst/gstelement.h: make GST_ELEMENT_ERROR do a GST_ERROR_OBJECT --- ChangeLog | 7 +++++++ docs/random/mimetypes | 3 ++- gst/gstelement.h | 8 +++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8896ec3..e824247 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-30 Benjamin Otte + + * docs/random/mimetypes: + correct Theora information + * gst/gstelement.h: + make GST_ELEMENT_ERROR do a GST_ERROR_OBJECT + 2004-01-29 Julien MOUTTE * gst/elements/gstfilesrc.c: (gst_filesrc_get), diff --git a/docs/random/mimetypes b/docs/random/mimetypes index 128c95c..a66ddac 100644 --- a/docs/random/mimetypes +++ b/docs/random/mimetypes @@ -292,7 +292,8 @@ framerate = 0 - MAXFLOAT (FLOAT) MIME type: video/x-theora Properties: Encoder: - Decoder: ffdec_vp3 + Decoder: + This is the raw stream that comes out of an ogg file. 15 - Huffyuv MIME type: video/x-huffyuv diff --git a/gst/gstelement.h b/gst/gstelement.h index e8e9562..1ef7223 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -140,11 +140,13 @@ typedef enum { #define GST_ELEMENT_PADS(obj) ((obj)->pads) #define GST_ELEMENT_ERROR(el, domain, code, message, debug) G_STMT_START { \ + gchar *__msg = _gst_element_error_printf message; \ + gchar *__dbg = _gst_element_error_printf debug; \ + GST_ERROR_OBJECT (el, "%s", __dbg); \ gst_element_error_full (GST_ELEMENT(el), \ GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code, \ - _gst_element_error_printf message, \ - _gst_element_error_printf debug, \ - __FILE__, GST_FUNCTION, __LINE__); } G_STMT_END + __msg, __dbg, __FILE__, GST_FUNCTION, __LINE__); \ +} G_STMT_END typedef struct _GstElementFactory GstElementFactory; typedef struct _GstElementFactoryClass GstElementFactoryClass; -- 2.7.4