diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/mplex/gstmplex.cc | 2 | ||||
| -rw-r--r-- | ext/mplex/gstmplexibitstream.cc | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2004-01-20 Ronald Bultje <rbultje@ronald.bitfreak.net> + * ext/mplex/gstmplex.cc: + * ext/mplex/gstmplexibitstream.cc: + g++ doesn't like NULL in our i18n/error macros, should be + either (NULL) or (""). + +2004-01-20 Ronald Bultje <rbultje@ronald.bitfreak.net> + * sys/dxr3/dxr3audiosink.c: * sys/dxr3/dxr3init.c: * sys/dxr3/dxr3spusink.c: (dxr3spusink_close): diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 0eb87779..ded48922 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -279,7 +279,7 @@ gst_mplex_loop (GstElement *element) } if (!mplex->job->video_tracks && !mplex->job->audio_tracks) { - gst_element_error (element, CORE, NEGOTIATION, NULL, + gst_element_error (element, CORE, NEGOTIATION, (""), ("no input video or audio tracks set up before loop function")); return; } diff --git a/ext/mplex/gstmplexibitstream.cc b/ext/mplex/gstmplexibitstream.cc index 21e1892e..b47c074a 100644 --- a/ext/mplex/gstmplexibitstream.cc +++ b/ext/mplex/gstmplexibitstream.cc @@ -53,7 +53,7 @@ GstMplexIBitStream::GstMplexIBitStream (GstPad *_pad, gst_bytestream_peek_bytes (bs, &data, 1); if (!ReadIntoBuffer () && buffered == 0) { - gst_element_error (gst_pad_get_parent (_pad), RESOURCE, READ, NULL, + gst_element_error (gst_pad_get_parent (_pad), RESOURCE, READ, (""), ("Failed to read from input pad %s", gst_pad_get_name (pad))); } |