From 71121018f6d76f03ad6fd7d85cf9703d9b10b6b8 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 20 Jan 2004 13:38:06 +0000 Subject: [PATCH] ext/mplex/: g++ doesn't like NULL in our i18n/error macros, should be either (NULL) or (""). Original commit message from CVS: 2004-01-20 Ronald Bultje * ext/mplex/gstmplex.cc: * ext/mplex/gstmplexibitstream.cc: g++ doesn't like NULL in our i18n/error macros, should be either (NULL) or (""). --- ChangeLog | 7 +++++++ ext/mplex/gstmplex.cc | 2 +- ext/mplex/gstmplexibitstream.cc | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a796876ba..54a83b1b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-20 Ronald Bultje + + * 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 * sys/dxr3/dxr3audiosink.c: diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 0eb877798d..ded489226d 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 21e1892e73..b47c074a5b 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))); }