summaryrefslogtreecommitdiffstats
path: root/gst-libs
diff options
context:
space:
mode:
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/ext/ffmpeg/.gitignore1
-rw-r--r--gst-libs/gst/riff/riff.h1
-rw-r--r--gst-libs/gst/riff/riffutil.c2
3 files changed, 1 insertions, 3 deletions
diff --git a/gst-libs/ext/ffmpeg/.gitignore b/gst-libs/ext/ffmpeg/.gitignore
deleted file mode 100644
index 20645e64..00000000
--- a/gst-libs/ext/ffmpeg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
diff --git a/gst-libs/gst/riff/riff.h b/gst-libs/gst/riff/riff.h
index 1788672e..8d897251 100644
--- a/gst-libs/gst/riff/riff.h
+++ b/gst-libs/gst/riff/riff.h
@@ -53,7 +53,6 @@ typedef enum {
#define GST_RIFF_TAG_LIST MAKE_FOUR_CC('L','I','S','T')
#define GST_RIFF_TAG_avih MAKE_FOUR_CC('a','v','i','h')
#define GST_RIFF_TAG_strd MAKE_FOUR_CC('s','t','r','d')
-#define GST_RIFF_TAG_strn MAKE_FOUR_CC('s','t','r','n')
#define GST_RIFF_TAG_strh MAKE_FOUR_CC('s','t','r','h')
#define GST_RIFF_TAG_strf MAKE_FOUR_CC('s','t','r','f')
#define GST_RIFF_TAG_vedt MAKE_FOUR_CC('v','e','d','t')
diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c
index e4c134fb..b363ddb8 100644
--- a/gst-libs/gst/riff/riffutil.c
+++ b/gst-libs/gst/riff/riffutil.c
@@ -32,7 +32,7 @@ gulong gst_riff_fourcc_to_id(gchar *fourcc) {
}
gchar *gst_riff_id_to_fourcc(gulong id) {
- static gchar fourcc[5];
+ gchar *fourcc = (gchar *)g_malloc(5);
g_return_val_if_fail(fourcc != NULL, NULL);