mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

libav: Fix symbol redefine build error

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=796827
This commit is contained in:
Seungha Yang 2018-07-18 19:41:50 +09:00 committed by Tim-Philipp Müller
parent c881f831c3
commit db82350245
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/libav/gstav.c
View file

@ -39,7 +39,6 @@
#endif #endif
GST_DEBUG_CATEGORY (ffmpeg_debug); GST_DEBUG_CATEGORY (ffmpeg_debug);
GST_DEBUG_CATEGORY (CAT_PERFORMANCE);
static GMutex gst_avcodec_mutex; static GMutex gst_avcodec_mutex;
@ -140,7 +139,6 @@ static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "libav", 0, "libav elements"); 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 */ /* Bail if not FFmpeg. We can no longer ensure operation with Libav */
if (!gst_ffmpeg_avcodec_is_ffmpeg ()) { if (!gst_ffmpeg_avcodec_is_ffmpeg ()) {

2
ext/libav/gstav.h
View file

@ -34,8 +34,6 @@
GST_DEBUG_CATEGORY_EXTERN (ffmpeg_debug); GST_DEBUG_CATEGORY_EXTERN (ffmpeg_debug);
#define GST_CAT_DEFAULT ffmpeg_debug #define GST_CAT_DEFAULT ffmpeg_debug
GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE);
G_BEGIN_DECLS G_BEGIN_DECLS
extern gboolean gst_ffmpegdemux_register (GstPlugin * plugin); extern gboolean gst_ffmpegdemux_register (GstPlugin * plugin);

6
ext/libav/gstavauddec.c
View file

@ -36,6 +36,8 @@
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavauddec.h" #include "gstavauddec.h"
GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
/* A number of function prototypes are given so we can refer to them later. */ /* 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_base_init (GstFFMpegAudDecClass * klass);
static void gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass); static void gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass);
@ -134,6 +136,8 @@ gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass)
gstaudiodecoder_class->flush = GST_DEBUG_FUNCPTR (gst_ffmpegauddec_flush); gstaudiodecoder_class->flush = GST_DEBUG_FUNCPTR (gst_ffmpegauddec_flush);
gstaudiodecoder_class->propose_allocation = gstaudiodecoder_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_ffmpegauddec_propose_allocation); GST_DEBUG_FUNCPTR (gst_ffmpegauddec_propose_allocation);
GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
} }
static void static void
@ -729,7 +733,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d", GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d",
ffmpegdec->padded_size); ffmpegdec->padded_size);
} }
GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec, GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec,
"Copy input to add padding"); "Copy input to add padding");
memcpy (ffmpegdec->padded, data, size); memcpy (ffmpegdec->padded, data, size);
memset (ffmpegdec->padded + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); memset (ffmpegdec->padded + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);

6
ext/libav/gstavviddec.c
View file

@ -32,6 +32,8 @@
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavviddec.h" #include "gstavviddec.h"
GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
#define MAX_TS_MASK 0xff #define MAX_TS_MASK 0xff
#define DEFAULT_LOWRES 0 #define DEFAULT_LOWRES 0
@ -248,6 +250,8 @@ gst_ffmpegviddec_class_init (GstFFMpegVidDecClass * klass)
viddec_class->drain = gst_ffmpegviddec_drain; viddec_class->drain = gst_ffmpegviddec_drain;
viddec_class->decide_allocation = gst_ffmpegviddec_decide_allocation; viddec_class->decide_allocation = gst_ffmpegviddec_decide_allocation;
viddec_class->propose_allocation = gst_ffmpegviddec_propose_allocation; viddec_class->propose_allocation = gst_ffmpegviddec_propose_allocation;
GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
} }
static void static void
@ -1765,7 +1769,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d", GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d",
ffmpegdec->padded_size); ffmpegdec->padded_size);
} }
GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec, GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec,
"Copy input to add padding"); "Copy input to add padding");
memcpy (ffmpegdec->padded, data, size); memcpy (ffmpegdec->padded, data, size);
memset (ffmpegdec->padded + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); memset (ffmpegdec->padded + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);