diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-20 16:07:50 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-20 16:07:50 +0100 |
| commit | a9f5def9d11c9a6623d7ed9d365160a4d8076b17 (patch) | |
| tree | a9dfdf436a01ce2f5dc0cd5551afd9445dfa9bf7 /ext/gme | |
| parent | 232ef9cc391efb52ea07ae7a84d1acca6e7124a6 (diff) | |
| parent | 87163ea09117bb836b3486d79f9cfb657250b805 (diff) | |
| download | gstreamer-plugins-bad-a9f5def9d11c9a6623d7ed9d365160a4d8076b17.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/opus/gstopusparse.c
gst/colorspace/colorspace.c
Diffstat (limited to 'ext/gme')
| -rw-r--r-- | ext/gme/gstgme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c index a3cfdaaba..1cd6161ac 100644 --- a/ext/gme/gstgme.c +++ b/ext/gme/gstgme.c @@ -363,7 +363,7 @@ gst_gme_play (GstPad * pad) gst_buffer_unmap (out, &map); if (gme_err) { - GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), (gme_err)); + GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), ("%s", gme_err)); gst_pad_pause_task (pad); gst_pad_push_event (pad, gst_event_new_eos ()); gst_object_unref (gme); @@ -433,7 +433,7 @@ gme_setup (GstGmeDec * gme) gme->player = NULL; } - GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), (gme_err)); + GST_ELEMENT_ERROR (gme, STREAM, DEMUX, (NULL), ("%s", gme_err)); return FALSE; } |