diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-20 13:38:06 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-20 13:38:06 +0000 |
| commit | 71121018f6d76f03ad6fd7d85cf9703d9b10b6b8 (patch) | |
| tree | f0b1fbb5c07b6db2c29d3c89d84e74c705d45dc0 /ext/mplex | |
| parent | 575e9fc0ce72e15232b2e372a040f74314493d05 (diff) | |
| download | gst-plugins-bad-71121018f6d76f03ad6fd7d85cf9703d9b10b6b8.tar.gz gst-plugins-bad-71121018f6d76f03ad6fd7d85cf9703d9b10b6b8.tar.bz2 gst-plugins-bad-71121018f6d76f03ad6fd7d85cf9703d9b10b6b8.zip | |
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 <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 ("").
Diffstat (limited to 'ext/mplex')
| -rw-r--r-- | ext/mplex/gstmplex.cc | 2 | ||||
| -rw-r--r-- | ext/mplex/gstmplexibitstream.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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))); } |