summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2020-07-15 10:49:03 +0300
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-07-29 08:38:31 +0000
commit995a135df6276a060ce16078fd6db54668163199 (patch)
treeaa0a8874f902c903150dc8dd95b76518b10c0f4c
parentea945eb9c6af89a1ab70ad254fd6f9523eb5861d (diff)
amrnbenc: remove global variables
gstcheck is declaring its own buffers glist which ends up overwritten, loks like the code meant to use that already gcc 10 is also complaining about this, but only on static builds for some reason ``` FAILED: subprojects/gst-plugins-ugly/tests/check/elements_amrnbenc /usr/bin/ld: subprojects/gstreamer/libs/gst/check/libgstcheck-1.0.a(gstcheck.c.o):(.bss+0x38): multiple definition of `buffers'; subprojects/gst-plugins-ugly/tests/check/708af1f@@elements_amrnbenc@exe/elements_amrnbenc.c.o:(.bss+0x18): first defined here collect2: error: ld returned 1 exit status ``` also remove unused var `current_buf` Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/merge_requests/62>
-rw-r--r--tests/check/elements/amrnbenc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/check/elements/amrnbenc.c b/tests/check/elements/amrnbenc.c
index 4f9b4b50..3875e80a 100644
--- a/tests/check/elements/amrnbenc.c
+++ b/tests/check/elements/amrnbenc.c
@@ -28,10 +28,7 @@
"layout = (string) interleaved, channels = (int) 1, rate = (int) 8000"
#define SINK_CAPS "audio/AMR"
-GList *buffers;
-GList *current_buf = NULL;
-
-GstPad *srcpad, *sinkpad;
+static GstPad *srcpad, *sinkpad;
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,