summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2016-02-20 12:59:38 +0000
committerTim-Philipp Müller <tim@centricular.com>2016-02-20 12:59:38 +0000
commit9e00a37d0efec78a9d5817c384ddffa1efe7caee (patch)
treecb901865a29142395277d698bfc763ffeaaafbec
parent154a0430fbfee61329832a33a3152cded2c7c18a (diff)
downloadgst-libav-9e00a37d0efec78a9d5817c384ddffa1efe7caee.tar.gz
Don't use exported but undeclared core debug category symbols
It's not right and won't work on Windows with MSVC.
-rw-r--r--ext/libav/gstav.c2
-rw-r--r--ext/libav/gstav.h2
-rw-r--r--ext/libav/gstavauddec.c6
-rw-r--r--ext/libav/gstavviddec.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/libav/gstav.c b/ext/libav/gstav.c
index 66b8bca..eb476c9 100644
--- a/ext/libav/gstav.c
+++ b/ext/libav/gstav.c
@@ -35,6 +35,7 @@
#include "gstavutils.h"
GST_DEBUG_CATEGORY (ffmpeg_debug);
+GST_DEBUG_CATEGORY (CAT_PERFORMANCE);
static GMutex gst_avcodec_mutex;
@@ -135,6 +136,7 @@ static gboolean
plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "libav", 0, "libav elements");
+ GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE");
/* Bail if not FFmpeg. We can no longer ensure operation with Libav */
if (!gst_ffmpeg_avcodec_is_ffmpeg ()) {
diff --git a/ext/libav/gstav.h b/ext/libav/gstav.h
index 82e2972..7f11a9e 100644
--- a/ext/libav/gstav.h
+++ b/ext/libav/gstav.h
@@ -34,6 +34,8 @@
GST_DEBUG_CATEGORY_EXTERN (ffmpeg_debug);
#define GST_CAT_DEFAULT ffmpeg_debug
+GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE);
+
G_BEGIN_DECLS
extern gboolean gst_ffmpegdemux_register (GstPlugin * plugin);
diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c
index acb3b18..6f0417c 100644
--- a/ext/libav/gstavauddec.c
+++ b/ext/libav/gstavauddec.c
@@ -36,8 +36,6 @@
#include "gstavutils.h"
#include "gstavauddec.h"
-GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
-
/* A number of function prototypes are given so we can refer to them later. */
static void gst_ffmpegauddec_base_init (GstFFMpegAudDecClass * klass);
static void gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass);
@@ -750,7 +748,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d",
ffmpegdec->padded_size);
}
- GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec,
+ GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Copy input to add padding");
memcpy (ffmpegdec->padded, bdata, bsize);
memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
@@ -769,7 +767,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
if (do_padding) {
/* add temporary padding */
- GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec,
+ GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Add temporary input padding");
memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE);
memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index 9e99d3a..cafd03c 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -37,8 +37,6 @@
#include "gstavutils.h"
#include "gstavviddec.h"
-GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
-
#define MAX_TS_MASK 0xff
#define DEFAULT_LOWRES 0
@@ -1596,7 +1594,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d",
ffmpegdec->padded_size);
}
- GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec,
+ GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Copy input to add padding");
memcpy (ffmpegdec->padded, bdata, bsize);
memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
@@ -1616,7 +1614,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
if (do_padding) {
/* add temporary padding */
- GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec,
+ GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Add temporary input padding");
memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE);
memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);