compatibility fix for new GST_DEBUG stuff.

Original commit message from CVS:
compatibility fix for new GST_DEBUG stuff.
Includes fixes for missing includes for config.h and unistd.h

I only ensured for plugins I can build that they work, so if some of them are still broken, you gotta fix them yourselves unfortunately.

diff --git a/common b/common
index 9a3a505..2a3efdc 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9a3a505fcc52865de0bedbb3ee1ce0a6dcc9a025
+Subproject commit 2a3efdc282fb1ecfd2720dea40523b3441f10fed

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index d76aac0..b373a1d 100644 (file)
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -204,7 +204,7 @@ gst_ffmpegdec_connect (GstPad  *pad,
    * simply because we don't know! We only get it
    * during playback... */
   if (avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) {
-    GST_DEBUG (GST_CAT_PLUGIN_INFO,
+    GST_DEBUG (
                "ffdec_%s: Failed to open FFMPEG codec",
                oclass->in_plugin->name);
     return GST_PAD_LINK_REFUSED;

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index c4f730d..354d8ef 100644 (file)
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -297,7 +297,7 @@ gst_ffmpegdemux_loop (GstElement *element)
     caps = gst_ffmpeg_codecid_to_caps (st->codec.codec_id,
                                       &st->codec);
     if (gst_pad_try_set_caps (pad, caps) <= 0) {
-      GST_DEBUG (GST_CAT_PLUGIN_ERRORS,
+      GST_DEBUG (
                 "Failed to set caps from ffdemuxer on next element");
       /* we continue here, in the next pad-is-usable check,
        * we'll return nonetheless */

diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index 7755f50..26f5cea 100644 (file)
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -300,7 +300,7 @@ gst_ffmpegenc_connect (GstPad  *pad,
 
     /* open codec */
     if (avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) {
-      GST_DEBUG (GST_CAT_PLUGIN_INFO,
+      GST_DEBUG (
                 "ffenc_%s: Failed to open FFMPEG codec",
                 oclass->in_plugin->name);
       continue;
@@ -318,14 +318,14 @@ gst_ffmpegenc_connect (GstPad  *pad,
                                         ffmpegenc->context);
   if (!ret_caps) {
     avcodec_close (ffmpegenc->context);
-    GST_DEBUG (GST_CAT_PLUGIN_INFO,
+    GST_DEBUG (
               "Unsupported codec - no caps found");
     return GST_PAD_LINK_REFUSED;
   }
 
   if ((ret = gst_pad_try_set_caps (ffmpegenc->srcpad, ret_caps)) <= 0) {
     avcodec_close (ffmpegenc->context);
-    GST_DEBUG (GST_CAT_PLUGIN_INFO,
+    GST_DEBUG (
               "Failed to set caps on next element for ffmpeg encoder (%s)",
                oclass->in_plugin->name);
     return ret;

diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index fb85964..a5013e3 100644 (file)
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -222,7 +222,7 @@ gst_ffmpegmux_request_new_pad (GstElement *element,
   ffmpegmux->context->streams[padnum] = st;
 
   /* we love debug output (c) (tm) (r) */
-  GST_DEBUG (GST_CAT_PLUGIN_INFO,
+  GST_DEBUG (
             "Created %s pad for ffmux_%s element",
             padname, oclass->in_plugin->name);
   g_free (padname);
@@ -283,7 +283,7 @@ gst_ffmpegmux_loop (GstElement *element)
 
     /* check whether the pad has successfully completed capsnego */ 
     if (st->codec.codec_id == CODEC_ID_NONE) {
-      GST_DEBUG (GST_CAT_PLUGIN_INFO,
+      GST_DEBUG (
                 "ffmux loop function called without capsnego on pad %d",
                 i);
       return;