Replace gst-i18n-*.h with gi18n-lib.h

GLib guarantees libintl is always present, using proxy-libintl as
last resort. There is no need to mock gettex API any more.

This fix static build on Windows because G_INTL_STATIC_COMPILATION must
be defined before including libintl.h, and glib does it for us as part
as including glib.h.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2028>

diff --git a/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c b/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c
index 01078c4..2a2d3a4 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c
+++ b/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstcurlelements.h"
 

diff --git a/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c b/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c
index a8de12e..781a67f 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c
+++ b/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c
@@ -116,7 +116,7 @@
 #include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstcurlelements.h"
 #include "gstcurlhttpsrc.h"

diff --git a/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c b/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c
index a71e72d..f26067d 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c
+++ b/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c
@@ -285,7 +285,7 @@
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/tag/tag.h>
 #include <gst/net/gstnet.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include "gstdashdemux.h"
 #include "gstdash_debug.h"
 

diff --git a/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c b/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c
index d19297c..4e5e832 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c
+++ b/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c
@@ -115,7 +115,7 @@
 #include "gstladspafilter.h"
 #include "gstladspasource.h"
 #include "gstladspasink.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <ladspa.h>

diff --git a/subprojects/gst-plugins-bad/ext/openal/gstopenal.c b/subprojects/gst-plugins-bad/ext/openal/gstopenal.c
index d266892..5ad55a7 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/openal/gstopenal.c
+++ b/subprojects/gst-plugins-bad/ext/openal/gstopenal.c
@@ -28,7 +28,7 @@
 
 #include "gstopenalelements.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 
 static gboolean

diff --git a/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c b/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c
index 3f85f8d..6ecd7a8 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c
+++ b/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c
@@ -30,7 +30,7 @@
 #include "gstopenalsink.h"
 #include "gstopenalsrc.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (openal_debug);
 

diff --git a/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp b/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp
index c3096a4..7caef3c 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp
+++ b/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp
@@ -60,7 +60,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gsttemplatematch.h"
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgcodecs.hpp>

diff --git a/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c b/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c
index 9fe54f9..75ebd71 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c
+++ b/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c
@@ -28,7 +28,7 @@
 #include <gst/pbutils/missing-plugins.h>
 #include <gst/video/video.h>
 #include <gst/audio/audio.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "resindvdbin.h"
 #include "resindvdsrc.h"

diff --git a/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c b/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c
index b4b8f92..0b1bd2f 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c
+++ b/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c
@@ -28,7 +28,7 @@
 #include <gmodule.h>
 #include <gst/gst.h>
 #include <gst/glib-compat-private.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 #include <gst/video/navigation.h>
 #include <gst/tag/tag.h>

diff --git a/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c b/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c
index bf52cb0..f69b641 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c
+++ b/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c
@@ -53,7 +53,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstrtmpelements.h"
 #include "gstrtmpsrc.h"

diff --git a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
index a3c24fd..167b4c2 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
+++ b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
@@ -67,7 +67,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c
index 36261f0..8826ad0 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c
+++ b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 
 #include "gstmssdemux.h"

diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c
index 6fb9668..0fb491f 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gstsfelements.h"

diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c
index d9f4029..29bdca9 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <stdlib.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/audio/audio.h>
 
 #include "gstsfelements.h"

diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c
index 2151a45..b8b332e 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gstsfelements.h"

diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c
index 219f1a9..bd1bb9d 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c
@@ -24,7 +24,7 @@
 
 #include <gst/audio/audio.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsfsink.h"
 

diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c
index 9b2dda8..eda3140 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c
@@ -25,7 +25,7 @@
 #  include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsfsrc.h"
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
index a495ec2..4e7a177 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
@@ -119,7 +119,7 @@ that the demux object and its streams are not changed by anybody else.
 #endif
 
 #include "gstadaptivedemux.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/base/gstadapter.h>
 
 GST_DEBUG_CATEGORY (adaptivedemux_debug);

diff --git a/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c b/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c
index e155431..cc96d75 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c
+++ b/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c
@@ -57,7 +57,7 @@
 #include <gst/audio/audio.h>
 #include <gst/tag/tag.h>
 #include <gst/pbutils/descriptions.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (aiffparse_debug);
 #define GST_CAT_DEFAULT (aiffparse_debug)

diff --git a/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c b/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c
index 3d2f91b..4338bc1 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c
+++ b/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c
@@ -24,7 +24,7 @@
 
 #include <gst/tag/tag.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "aiffelements.h"
 

diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c
index 0ab4660..99215b9 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c
+++ b/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c
@@ -75,7 +75,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gstasfmux.h"
 
 #define DEFAULT_SIMPLE_INDEX_TIME_INTERVAL G_GUINT64_CONSTANT (10000000)

diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c
index 5859c7f..b2b5ffd 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c
+++ b/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c
@@ -25,7 +25,7 @@
 #include "gstasfparse.h"
 
 /* FIXME add this include
- * #include <gst/gst-i18n-plugin.h> */
+ * #include <glib/gi18n-lib.h> */
 
 GST_DEBUG_CATEGORY_STATIC (asfparse_debug);
 #define GST_CAT_DEFAULT asfparse_debug

diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c b/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c
index 9a60d35..8453613 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 #include <gst/basecamerabinsrc/gstbasecamerasrc.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "camerabingeneral.h"
 

diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c
index 6ac5ce4..3824a4b 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c
@@ -146,7 +146,7 @@
 
 #include <gst/basecamerabinsrc/gstbasecamerasrc.h>
 #include "gstcamerabin2.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/glib-compat-private.h>
 

diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c
index c7de9a6..041bffc 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c
@@ -40,7 +40,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gstdigitalzoom.h"
 
 enum

diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c
index 1c37cef..1ff7046 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c
@@ -38,7 +38,7 @@
 #include "camerabingeneral.h"
 #include <gst/pbutils/pbutils.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_viewfinder_bin_debug);
 #define GST_CAT_DEFAULT gst_viewfinder_bin_debug

diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c
index 819a6a5..cf21f43 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c
@@ -33,7 +33,7 @@
 #endif
 
 #include <gst/interfaces/photography.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstwrappercamerabinsrc.h"
 #include "gstdigitalzoom.h"

diff --git a/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c b/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c
index 2e049b6..f7d20d2 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c
+++ b/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c
@@ -32,7 +32,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 
 #include <string.h>

diff --git a/subprojects/gst-plugins-bad/gst/midi/midi.c b/subprojects/gst-plugins-bad/gst/midi/midi.c
index 01e9b6d..2385f98 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/midi/midi.c
+++ b/subprojects/gst-plugins-bad/gst/midi/midi.c
@@ -24,7 +24,7 @@
 
 #include <gst/tag/tag.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "midiparse.h"
 

diff --git a/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c b/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
index 4675dc8..5a0d309 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
+++ b/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "mpegtsbase.h"
 #include "gstmpegdesc.h"
 

diff --git a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c
index da56a0d..706e639 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c
+++ b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c
@@ -24,7 +24,7 @@
 
 #include "gsttranscoding.h"
 #include "gsttranscodeelements.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include <gst/pbutils/missing-plugins.h>

diff --git a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c
index 7fae04b..7a51ea8 100644 (file)
--- a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c
+++ b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "gsttranscodeelements.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include <gst/pbutils/missing-plugins.h>

diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c
index 0ce6be4..4b1a124 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstdvbelements.h"
 

diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c
index 50f3931..ca84251 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstdvbelements.h"
 

diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c
index 92c918c..b8e5b1a 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c
@@ -111,7 +111,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /* Before 5.6 we map A to AC */
 #if !HAVE_V5_MINOR(6)

diff --git a/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c b/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c
index 1ecc38a..cd1dfb7 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "parsechannels.h"
 

diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c b/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c
index 695537a..2bf4166 100644 (file)
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c
@@ -27,7 +27,7 @@
 #include "gstalsaelements.h"
 #include "gstalsadeviceprovider.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (alsa_debug);
 

diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c b/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c
index 9f1ab2e..87803c6 100644 (file)
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c
@@ -26,7 +26,7 @@
 #include "gstalsaelements.h"
 #include "gstalsadeviceprovider.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 static gboolean
 plugin_init (GstPlugin * plugin)

diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c b/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c
index eab4059..1728213 100644 (file)
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c
@@ -52,7 +52,7 @@
 #include "gstalsasink.h"
 
 #include <gst/audio/gstaudioiec61937.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #ifndef ESTRPIPE
 #define ESTRPIPE EPIPE

diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c b/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c
index 72e5452..2e97f39 100644 (file)
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c
@@ -48,7 +48,7 @@
 #include "gstalsaelements.h"
 #include "gstalsasrc.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #ifndef ESTRPIPE
 #define ESTRPIPE EPIPE

diff --git a/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c b/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c
index 572fb89..4171732 100644 (file)
--- a/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c
+++ b/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include "gstcdparanoiasrc.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 enum
 {

diff --git a/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c b/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c
index b3cc83f..7d021f4 100644 (file)
--- a/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c
+++ b/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c
@@ -43,7 +43,7 @@
 #endif
 
 #include <gst/gl/gstglfuncs.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstglelements.h"
 #include "gstgltestsrc.h"

diff --git a/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c b/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
index 91bf1d8..649f63d 100644 (file)
--- a/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
+++ b/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
@@ -40,7 +40,7 @@
 #endif
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 #include <gst/audio/audio.h>
 

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
index a384e8e..8edd118 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
@@ -40,7 +40,7 @@
 #include <gst/audio/audio.h>
 #include "gstaudiobasesrc.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_audio_base_src_debug);
 #define GST_CAT_DEFAULT gst_audio_base_src_debug

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c
index d295f39..437bebb 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c
@@ -96,7 +96,7 @@
 #include <gst/tag/tag.h>
 #include <gst/audio/audio.h>
 #include "gstaudiocdsrc.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_audio_cd_src_debug);
 #define GST_CAT_DEFAULT gst_audio_cd_src_debug

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c
index 8716b72..fa28345 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <gst/gl/gl.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /**
  * SECTION:gstglbasesrc

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
index 3c6943e..a46823b 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
index 4b0f687..52540bc 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
@@ -53,7 +53,7 @@
 # include <unistd.h>            /* getpid on UNIX */
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "pbutils.h"
 #include "pbutils-private.h"

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c
index 3aee17e..a6408d8 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c
@@ -59,7 +59,7 @@
 #include "pbutils.h"
 #include "pbutils-private.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #ifndef GST_DISABLE_GST_DEBUG
 #define GST_CAT_DEFAULT gst_pb_utils_ensure_debug_category()

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
index 5702f7c..173da37 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
@@ -64,7 +64,7 @@
 
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/base/gstadapter.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 typedef enum

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c
index 28279d1..ae6dd54 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c
@@ -38,7 +38,7 @@
 #define ISO_639_XML_PATH ISO_CODES_PREFIX "/share/xml/iso-codes/iso_639.xml"
 #define ISO_CODES_LOCALEDIR ISO_CODES_PREFIX "/share/locale"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 
 #include <string.h>

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c
index 7f0eef4..f9dce25 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/gst.h>
 #include "tag.h"

diff --git a/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c b/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
index a62e86a..e8b7af2 100644 (file)
--- a/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
+++ b/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
@@ -29,7 +29,7 @@
 #include "gstsmartencoder.h"
 #include "gststreamsplitter.h"
 #include "gststreamcombiner.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /**
  * SECTION:element-encodebin

diff --git a/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c b/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c
index a06a808..04a1bdb 100644 (file)
--- a/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c
+++ b/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstencodingelements.h"
 

diff --git a/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c b/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c
index f4be478..8a8722d 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c
@@ -92,7 +92,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <gst/gst.h>

diff --git a/subprojects/gst-plugins-base/gst/playback/gstparsebin.c b/subprojects/gst-plugins-base/gst/playback/gstparsebin.c
index a17cc6b..c1b7cae 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstparsebin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstparsebin.c
@@ -97,7 +97,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <gst/gst.h>

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c b/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c
index 8505fdf..244c164 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c
@@ -30,7 +30,7 @@
 
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstplaybackelements.h"

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
index 4adc532..8d3a72b 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstplaybackelements.h"

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c b/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c
index 1dc2b45..beeaaa8 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c
@@ -207,7 +207,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/audio/streamvolume.h>
 #include <gst/video/video-info.h>

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c b/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
index d7089bd..2938459 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
@@ -219,7 +219,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/audio/streamvolume.h>
 #include <gst/video/video-info.h>

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysink.c b/subprojects/gst-plugins-base/gst/playback/gstplaysink.c
index a870613..2a45fec 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysink.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysink.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/video/video.h>
 #include <gst/audio/streamvolume.h>

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c b/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c
index 3f984da..0eeea55 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c
@@ -24,7 +24,7 @@
 #include "gstplaysinkaudioconvert.h"
 
 #include <gst/pbutils/pbutils.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_audio_convert_debug);
 #define GST_CAT_DEFAULT gst_play_sink_audio_convert_debug

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c b/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c
index d4f6570..1e5b2e2 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c
@@ -25,7 +25,7 @@
 #include "gstplaysinkconvertbin.h"
 
 #include <gst/pbutils/pbutils.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_convert_bin_debug);
 #define GST_CAT_DEFAULT gst_play_sink_convert_bin_debug

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c b/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c
index 5bac5d0..c0f0beb 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c
@@ -24,7 +24,7 @@
 #include "gstplaysinkvideoconvert.h"
 
 #include <gst/pbutils/pbutils.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_video_convert_debug);
 #define GST_CAT_DEFAULT gst_play_sink_video_convert_debug

diff --git a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c
index d2ef658..b27c2fc 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/missing-plugins.h>
 
 #include "gstplay-enum.h"

diff --git a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
index 3625393..85af4a6 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
+++ b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
@@ -50,7 +50,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/missing-plugins.h>
 
 #include "gstplay-enum.h"

diff --git a/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c b/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
index 2bff98a..c362779 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
@@ -45,7 +45,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/missing-plugins.h>
 
 #include "gstplay-enum.h"

diff --git a/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c b/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c
index e0e710c..c1ba106 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c
@@ -104,7 +104,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <sys/ioctl.h>
 

diff --git a/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c b/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c
index 32c6eb5..b7f76dd 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstmultihandlesink.h"
 

diff --git a/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c b/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c
index 0031fac..56d99d8 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c
@@ -103,7 +103,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/net/gstnetcontrolmessagemeta.h>
 
 #include <string.h>

diff --git a/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c b/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c
index 22d77b2..151d33f 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c
@@ -49,7 +49,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/net/gstnetcontrolmessagemeta.h>
 #include "gsttcpelements.h"
 #include "gstsocketsrc.h"

diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c
index 18253ce..a3a21bc 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c
@@ -41,7 +41,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gsttcpelements.h"
 #include "gsttcpclientsink.h"

diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c
index 5d65b26..acb5734 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c
@@ -43,7 +43,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gsttcpelements.h"
 #include "gsttcpclientsrc.h"
 #include "gsttcpsrcstats.h"

diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c
index 2a9a4bd..8022481 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c
@@ -37,7 +37,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>             /* memset */
 
 #include "gsttcpelements.h"

diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c
index b415235..2e3403b 100644 (file)
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gsttcpelements.h"
 #include "gsttcpsrcstats.h"
 #include "gsttcpserversrc.h"

diff --git a/subprojects/gst-plugins-base/tools/gst-device-monitor.c b/subprojects/gst-plugins-base/tools/gst-device-monitor.c
index 13ea0f4..ef57acc 100644 (file)
--- a/subprojects/gst-plugins-base/tools/gst-device-monitor.c
+++ b/subprojects/gst-plugins-base/tools/gst-device-monitor.c
@@ -24,7 +24,7 @@
 #include <locale.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-app.h>
+#include <glib/gi18n.h>
 #include <gst/math-compat.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/subprojects/gst-plugins-base/tools/gst-play.c b/subprojects/gst-plugins-base/tools/gst-play.c
index fdeb285..8d0b697 100644 (file)
--- a/subprojects/gst-plugins-base/tools/gst-play.c
+++ b/subprojects/gst-plugins-base/tools/gst-play.c
@@ -27,7 +27,7 @@
 #include <locale.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-app.h>
+#include <glib/gi18n.h>
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>
 #include <gst/pbutils/pbutils.h>

diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
index 8ef5056..38f36db 100644 (file)
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
@@ -30,7 +30,7 @@
 #include "gstadaptivedemux.h"
 #include "gstadaptivedemux-private.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/app/gstappsrc.h>
 
 GST_DEBUG_CATEGORY_EXTERN (adaptivedemux2_debug);

diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
index a805012..6588112 100644 (file)
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
@@ -105,7 +105,7 @@ By using the api_lock a thread is protected against other API calls.
 #include "gstadaptivedemux.h"
 #include "gstadaptivedemux-private.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/base/gstadapter.h>
 #include <gst/app/gstappsrc.h>
 

diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c
index ca790ba..843f0c6 100644 (file)
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c
@@ -67,7 +67,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/subprojects/gst-plugins-good/ext/flac/gstflacdec.c b/subprojects/gst-plugins-good/ext/flac/gstflacdec.c
index 361d181..49cb148 100644 (file)
--- a/subprojects/gst-plugins-good/ext/flac/gstflacdec.c
+++ b/subprojects/gst-plugins-good/ext/flac/gstflacdec.c
@@ -44,7 +44,7 @@
 #include <string.h>
 
 #include "gstflacdec.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 
 #include "gstflacelements.h"

diff --git a/subprojects/gst-plugins-good/ext/flac/gstflacelement.c b/subprojects/gst-plugins-good/ext/flac/gstflacelement.c
index 23eb3ba..6a408b6 100644 (file)
--- a/subprojects/gst-plugins-good/ext/flac/gstflacelement.c
+++ b/subprojects/gst-plugins-good/ext/flac/gstflacelement.c
@@ -24,7 +24,7 @@
 #include "gstflacelements.h"
 
 #include <gst/tag/tag.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 void
 flac_element_init (GstPlugin * plugin)

diff --git a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c
index 4d18f7a..aa15037 100644 (file)
--- a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c
+++ b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c
@@ -57,7 +57,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <gst/audio/audio.h>

diff --git a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c
index 40784fa..b7e7330 100644 (file)
--- a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c
+++ b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c
@@ -76,7 +76,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c b/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
index 06559ad..b251abc 100644 (file)
--- a/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
+++ b/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
@@ -44,7 +44,7 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <jerror.h>
 
 #define MIN_WIDTH  1

diff --git a/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c b/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c
index 4016ff3..461cd52 100644 (file)
--- a/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c
+++ b/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c
@@ -63,7 +63,7 @@
 
 #include <string.h>
 #include "gstlamemp3enc.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /* lame < 3.98 */
 #ifndef HAVE_LAME_SET_VBR_QUALITY

diff --git a/subprojects/gst-plugins-good/ext/lame/plugin.c b/subprojects/gst-plugins-good/ext/lame/plugin.c
index 6eb9fdc..5ab5692 100644 (file)
--- a/subprojects/gst-plugins-good/ext/lame/plugin.c
+++ b/subprojects/gst-plugins-good/ext/lame/plugin.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstlamemp3enc.h"
 

diff --git a/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c b/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c
index 5f6dc8f..3775227 100644 (file)
--- a/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c
+++ b/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c
@@ -37,7 +37,7 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (pngdec_debug);
 #define GST_CAT_DEFAULT pngdec_debug

diff --git a/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c b/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c
index d539408..41fee1a 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c
+++ b/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstpulseelements.h"
 #include "pulsedeviceprovider.h"

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulsesink.c b/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
index a61c93d..723d8f9 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
+++ b/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
@@ -53,7 +53,7 @@
 #include <gst/base/gstbasesink.h>
 #include <gst/gsttaglist.h>
 #include <gst/audio/audio.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <gst/pbutils/pbutils.h>        /* only used for GST_PLUGINS_BASE_VERSION_* */
 

diff --git a/subprojects/gst-plugins-good/ext/shout2/gstshout2.c b/subprojects/gst-plugins-good/ext/shout2/gstshout2.c
index 8e2a59e..0c32b6a 100644 (file)
--- a/subprojects/gst-plugins-good/ext/shout2/gstshout2.c
+++ b/subprojects/gst-plugins-good/ext/shout2/gstshout2.c
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (shout2_debug);
 #define GST_CAT_DEFAULT shout2_debug

diff --git a/subprojects/gst-plugins-good/ext/soup/gstsoup.c b/subprojects/gst-plugins-good/ext/soup/gstsoup.c
index 477e4a1..4fb1816 100644 (file)
--- a/subprojects/gst-plugins-good/ext/soup/gstsoup.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsoup.c
@@ -17,7 +17,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsoupelements.h"
 #include "gstsouploader.h"

diff --git a/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c b/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
index 303187e..7558d72 100644 (file)
--- a/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsoupelements.h"
 #include "gstsouphttpsrc.h"

diff --git a/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c b/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
index 30d2f79..094ca76 100644 (file)
--- a/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
@@ -77,7 +77,7 @@
 #include <stdlib.h>             /* atoi() */
 #endif
 #include <gst/gstelement.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gstsoupelements.h"
 #include "gstsouphttpsrc.h"
 #include "gstsouputils.h"

diff --git a/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c b/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c
index 1fc7f09..649a71d 100644 (file)
--- a/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c
+++ b/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c
@@ -53,7 +53,7 @@
 
 #include "string.h"
 #include "gsttwolamemp2enc.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (debug);
 #define GST_CAT_DEFAULT debug

diff --git a/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c b/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c
index 65ec0e8..5a2c515 100644 (file)
--- a/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c
+++ b/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstwavpackelements.h"
 

diff --git a/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c b/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c
index 425bdb3..a357f84 100644 (file)
--- a/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c
+++ b/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c
@@ -47,7 +47,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstapedemux.h"

diff --git a/subprojects/gst-plugins-good/gst/avi/gstavidemux.c b/subprojects/gst-plugins-good/gst/avi/gstavidemux.c
index e25085f..eafe865 100644 (file)
--- a/subprojects/gst-plugins-good/gst/avi/gstavidemux.c
+++ b/subprojects/gst-plugins-good/gst/avi/gstavidemux.c
@@ -50,7 +50,7 @@
 #include "gstavielements.h"
 #include "gstavidemux.h"
 #include "avi-ids.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/base/gstadapter.h>
 #include <gst/tag/tag.h>
 

diff --git a/subprojects/gst-plugins-good/gst/avi/gstavielement.c b/subprojects/gst-plugins-good/gst/avi/gstavielement.c
index 37ff7c3..23010da 100644 (file)
--- a/subprojects/gst-plugins-good/gst/avi/gstavielement.c
+++ b/subprojects/gst-plugins-good/gst/avi/gstavielement.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include "gst/riff/riff-read.h"
 
 #include "gstavielements.h"

diff --git a/subprojects/gst-plugins-good/gst/avi/gstavimux.c b/subprojects/gst-plugins-good/gst/avi/gstavimux.c
index a71c243..5a14e9f 100644 (file)
--- a/subprojects/gst-plugins-good/gst/avi/gstavimux.c
+++ b/subprojects/gst-plugins-good/gst/avi/gstavimux.c
@@ -60,7 +60,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c b/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c
index c8420e8..833ff4c 100644 (file)
--- a/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c
+++ b/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c
@@ -42,7 +42,7 @@
 #include "config.h"
 #endif
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 
 #include "gsticydemux.h"

diff --git a/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c b/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c
index 7c2b5e7..b3e8adb 100644 (file)
--- a/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c
+++ b/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c
@@ -49,7 +49,7 @@
 #include "config.h"
 #endif
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 #include <gst/pbutils/pbutils.h>
 #include <string.h>

diff --git a/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c b/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c
index 06a82d2..7aea13b 100644 (file)
--- a/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstisomp4elements.h"

diff --git a/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c b/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c
index 3694d15..c401c5a 100644 (file)
--- a/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstisomp4elements.h"
 

diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
index 1f9b587..a67e5d3 100644 (file)
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
@@ -50,7 +50,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <glib/gprintf.h>
 #include <gst/base/base.h>

diff --git a/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c b/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c
index 6f220ed..27eae2d 100644 (file)
--- a/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c
+++ b/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c
@@ -50,7 +50,7 @@
 #include "gstsplitmuxsrc.h"
 #include "gstsplitutils.h"
 
-#include "../../gst-libs/gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (splitmux_debug);
 #define GST_CAT_DEFAULT splitmux_debug

diff --git a/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c b/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c
index f296a4b..7c3df4f 100644 (file)
--- a/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c
+++ b/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c
@@ -47,7 +47,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstrtspelements.h"
 

diff --git a/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c b/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
index e1180a1..e41c7b7 100644 (file)
--- a/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
+++ b/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
@@ -112,7 +112,7 @@
 #include <gst/sdp/gstmikey.h>
 #include <gst/rtp/rtp.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstrtspelements.h"
 #include "gstrtspsrc.h"

diff --git a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
index 04dca3e..f7b218f 100644 (file)
--- a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
+++ b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
@@ -55,7 +55,7 @@
 #include "gst/riff/riff-media.h"
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/pbutils/descriptions.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (wavparse_debug);
 #define GST_CAT_DEFAULT (wavparse_debug)

diff --git a/subprojects/gst-plugins-good/sys/oss/gstossaudio.c b/subprojects/gst-plugins-good/sys/oss/gstossaudio.c
index 5d476b4..2edf0c4 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss/gstossaudio.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstossaudio.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "common.h"
 #include "gstossaudioelements.h"

diff --git a/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c b/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c
index 1793bca..50e06a9 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "common.h"
 #include "gstossaudioelements.h"

diff --git a/subprojects/gst-plugins-good/sys/oss/gstosshelper.c b/subprojects/gst-plugins-good/sys/oss/gstosshelper.c
index e649e00..8290441 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss/gstosshelper.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstosshelper.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>

diff --git a/subprojects/gst-plugins-good/sys/oss/gstosssink.c b/subprojects/gst-plugins-good/sys/oss/gstosssink.c
index bae8edf..6af9729 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss/gstosssink.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstosssink.c
@@ -69,7 +69,7 @@
 #include "gstossaudioelements.h"
 #include "gstosssink.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (oss_debug);
 #define GST_CAT_DEFAULT oss_debug

diff --git a/subprojects/gst-plugins-good/sys/oss/gstosssrc.c b/subprojects/gst-plugins-good/sys/oss/gstosssrc.c
index a34e1ee..a299d47 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss/gstosssrc.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstosssrc.c
@@ -63,7 +63,7 @@
 #include "gstossaudioelements.h"
 #include "gstosssrc.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (oss_debug);
 #define GST_CAT_DEFAULT oss_debug

diff --git a/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c b/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c
index 8c3eb62..9e7be54 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c
+++ b/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/audio/audio.h>
 
 #include "oss4-audio.h"

diff --git a/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c b/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c
index 6533105..4e98992 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c
+++ b/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c
@@ -52,7 +52,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/audio/streamvolume.h>
 
 #define NO_LEGACY_MIXER

diff --git a/subprojects/gst-plugins-good/sys/oss4/oss4-source.c b/subprojects/gst-plugins-good/sys/oss4/oss4-source.c
index 4b994a0..4e07133 100644 (file)
--- a/subprojects/gst-plugins-good/sys/oss4/oss4-source.c
+++ b/subprojects/gst-plugins-good/sys/oss4/oss4-source.c
@@ -48,7 +48,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #define NO_LEGACY_MIXER
 #include "oss4-audio.h"

diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
index 4201e04..32eb120 100644 (file)
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
@@ -48,7 +48,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/audio/audio-channels.h>
 #include "gstosxaudioringbuffer.h"
 #include "gstosxaudiosink.h"

diff --git a/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c b/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
index 0a5b82c..c8abf39 100644 (file)
--- a/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
+++ b/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
@@ -27,7 +27,7 @@
 
 #include "RaspiCapture.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 static GstRpiCamSrcDevice *gst_rpi_cam_src_device_new (void);
 

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c
index ec53bc9..2d60709 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c
@@ -29,7 +29,7 @@
 # define _GNU_SOURCE            /* O_CLOEXEC */
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/gst.h>
 

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
index 18fb61b..a1dc9a0 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
@@ -43,7 +43,7 @@
 #include <gstv4l2bufferpool.h>
 
 #include "gstv4l2object.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/glib-compat-private.h>
 
 GST_DEBUG_CATEGORY_STATIC (v4l2bufferpool_debug);

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c
index e547e3b..08b3056 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 
 #include "gstv4l2elements.h"

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c
index 973993e..9a2229e 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c
@@ -35,7 +35,7 @@
 #include "gstv4l2fwhtenc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_fwht_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_fwht_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c
index b930986..7a83731 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c
@@ -33,7 +33,7 @@
 #include "gstv4l2h263enc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_h263_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_h263_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c
index 535725b..a5c193c 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2h264codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_h264_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_h264_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c
index 4e4797b..d84438a 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2h265codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_h265_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_h265_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c
index f99218a..eee7a67 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c
@@ -35,7 +35,7 @@
 #include "gstv4l2jpegenc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_jpeg_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_jpeg_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c
index af18688..f38ab3c 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2mpeg4codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_mpeg4_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_mpeg4_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
index 08fbf1b..5c8a112 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
@@ -39,7 +39,7 @@
 #include "gstv4l2tuner.h"
 #include "gstv4l2colorbalance.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/video/video.h>
 #include <gst/allocators/gstdmabuf.h>

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c
index c375492..0c69b7d 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c
@@ -42,7 +42,7 @@
 
 #include <string.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstv4l2elements.h"
 #include "gstv4l2object.h"

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c
index cc601ac..0500879 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c
@@ -61,7 +61,7 @@
 
 #include "gstv4l2elements.h"
 #include "gstv4l2sink.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
index d250147..f95250a 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
@@ -61,7 +61,7 @@
 #include "gstv4l2tuner.h"
 #include "gstv4l2vidorient.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (v4l2src_debug);
 #define GST_CAT_DEFAULT v4l2src_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c
index de7f39b..1da6ba0 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c
@@ -33,7 +33,7 @@
 #include "gstv4l2transform.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #define DEFAULT_PROP_DEVICE "/dev/video10"
 

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
index 71438f9..6684a91 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
@@ -40,7 +40,7 @@
 #include "gstv4l2vp9codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_video_dec_debug);
 #define GST_CAT_DEFAULT gst_v4l2_video_dec_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c
index 19496b7..3c70dc0 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c
@@ -35,7 +35,7 @@
 #include "gstv4l2videoenc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_video_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_video_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c
index 8bf9086..22e0fa9 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2vp8codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_vp8_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_vp8_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c
index f26a2eb..6b2d27b 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2vp9codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_vp9_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_vp9_enc_debug

diff --git a/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c b/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c
index c13b142..cb37ea7 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c
@@ -46,7 +46,7 @@
 #include "gstv4l2sink.h"
 #include "gstv4l2videodec.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
 #define GST_CAT_DEFAULT v4l2_debug

diff --git a/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c b/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c
index 2897008..dc6352a 100644 (file)
--- a/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c
+++ b/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c
@@ -47,7 +47,7 @@
 #include <X11/Xutil.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 
 #include "gst/glib-compat-private.h"

diff --git a/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c b/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c
index 15b044c..91010aa 100644 (file)
--- a/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c
+++ b/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c
@@ -68,7 +68,7 @@
 #include "gstcdiocddasrc.h"
 
 #include <gst/gst.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <stdlib.h>

diff --git a/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c b/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c
index cfd72ad..f09c880 100644 (file)
--- a/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c
+++ b/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c
@@ -36,7 +36,7 @@
 
 #include <gmodule.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gstgst_dvd_read_src_debug);
 #define GST_CAT_DEFAULT (gstgst_dvd_read_src_debug)

diff --git a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c
index 73a7db2..3be4b4b 100644 (file)
--- a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c
+++ b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/riff/riff-read.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstasfelements.h"
 

diff --git a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c
index 0c8dc84..87c685a 100644 (file)
--- a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c
+++ b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c
@@ -37,7 +37,7 @@
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/riff/riff-media.h>
 #include <gst/tag/tag.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c
index 3991f48..19448fc 100644 (file)
--- a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c
+++ b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/riff/riff-read.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstasfelements.h"
 

diff --git a/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c b/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c
index 653086a..16054e5 100644 (file)
--- a/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c
+++ b/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c
@@ -8,7 +8,7 @@
 #include <glib/gprintf.h>
 #include <gst/gst.h>
 #include <gio/gio.h>
-#include "gst/gst-i18n-app.h"
+#include <glib/gi18n.h>
 
 static GRegex *cleanup_caps_field = NULL;
 static void _add_object_details (GString * json, GString * other_types,

diff --git a/subprojects/gstreamer/gst/gst.c b/subprojects/gstreamer/gst/gst.c
index 9d45442..21c237c 100644 (file)
--- a/subprojects/gstreamer/gst/gst.c
+++ b/subprojects/gstreamer/gst/gst.c
@@ -119,7 +119,7 @@
 #endif
 #endif
 
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include <locale.h>             /* for LC_ALL */
 
 #include "gst.h"

diff --git a/subprojects/gstreamer/gst/gstelement.c b/subprojects/gstreamer/gst/gstelement.c
index 112ee47..168bfc2 100644 (file)
--- a/subprojects/gstreamer/gst/gstelement.c
+++ b/subprojects/gstreamer/gst/gstelement.c
@@ -101,7 +101,7 @@
 #include "gstquark.h"
 #include "gsttracerutils.h"
 #include "gstvalue.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "glib-compat-private.h"
 
 #ifndef GST_DISABLE_GST_DEBUG

diff --git a/subprojects/gstreamer/gst/gsterror.c b/subprojects/gstreamer/gst/gsterror.c
index 059cbca..3e11566 100644 (file)
--- a/subprojects/gstreamer/gst/gsterror.c
+++ b/subprojects/gstreamer/gst/gsterror.c
@@ -117,7 +117,7 @@
 
 #include "gst_private.h"
 #include <gst/gst.h>
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #define QUARK_FUNC(string)                                              \
 GQuark gst_ ## string ## _error_quark (void) {                          \

diff --git a/subprojects/gstreamer/gst/gstpipeline.c b/subprojects/gstreamer/gst/gstpipeline.c
index b5bbb45..e3a7f50 100644 (file)
--- a/subprojects/gstreamer/gst/gstpipeline.c
+++ b/subprojects/gstreamer/gst/gstpipeline.c
@@ -80,7 +80,7 @@
 
 #include "gst_private.h"
 #include "gsterror.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstpipeline.h"
 #include "gstinfo.h"

diff --git a/subprojects/gstreamer/gst/gstregistry.c b/subprojects/gstreamer/gst/gstregistry.c
index 2ae339f..47d6065 100644 (file)
--- a/subprojects/gstreamer/gst/gstregistry.c
+++ b/subprojects/gstreamer/gst/gstregistry.c
@@ -112,7 +112,7 @@
 
 #include "gstpluginloader.h"
 
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include "gst.h"
 #include "glib-compat-private.h"

diff --git a/subprojects/gstreamer/gst/gsttaglist.c b/subprojects/gstreamer/gst/gsttaglist.c
index fedfc37..cc9a42e 100644 (file)
--- a/subprojects/gstreamer/gst/gsttaglist.c
+++ b/subprojects/gstreamer/gst/gsttaglist.c
@@ -37,7 +37,7 @@
 #define GST_DISABLE_MINIOBJECT_INLINE_FUNCTIONS
 #include "gst_private.h"
 #include "math-compat.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gsttaglist.h"
 #include "gstinfo.h"
 #include "gstvalue.h"

diff --git a/subprojects/gstreamer/gst/gsturi.c b/subprojects/gstreamer/gst/gsturi.c
index d3501a8..8d52423 100644 (file)
--- a/subprojects/gstreamer/gst/gsturi.c
+++ b/subprojects/gstreamer/gst/gsturi.c
@@ -49,7 +49,7 @@
 #include "gstinfo.h"
 #include "gstregistry.h"
 
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <glib.h>

diff --git a/subprojects/gstreamer/gst/gstutils.c b/subprojects/gstreamer/gst/gstutils.c
index 85433b6..ebe00b9 100644 (file)
--- a/subprojects/gstreamer/gst/gstutils.c
+++ b/subprojects/gstreamer/gst/gstutils.c
@@ -45,7 +45,7 @@
 #include "gstparse.h"
 #include "gstvalue.h"
 #include "gstquark.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "glib-compat-private.h"
 #include <math.h>
 

diff --git a/subprojects/gstreamer/gst/parse/grammar.y.in b/subprojects/gstreamer/gst/parse/grammar.y.in
index cf5eb16..e544f5c 100644 (file)
--- a/subprojects/gstreamer/gst/parse/grammar.y.in
+++ b/subprojects/gstreamer/gst/parse/grammar.y.in
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include "../gstconfig.h"
 #include "../gstparse.h"

diff --git a/subprojects/gstreamer/libs/gst/base/gstbasesink.c b/subprojects/gstreamer/libs/gst/base/gstbasesink.c
index 751986d..294d946 100644 (file)
--- a/subprojects/gstreamer/libs/gst/base/gstbasesink.c
+++ b/subprojects/gstreamer/libs/gst/base/gstbasesink.c
@@ -147,7 +147,7 @@
 #include <gst/gst_private.h>
 
 #include "gstbasesink.h"
-#include <gst/gst-i18n-lib.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_base_sink_debug);
 #define GST_CAT_DEFAULT gst_base_sink_debug

diff --git a/subprojects/gstreamer/libs/gst/base/gstbasesrc.c b/subprojects/gstreamer/libs/gst/base/gstbasesrc.c
index 28259f4..25bd2a0 100644 (file)
--- a/subprojects/gstreamer/libs/gst/base/gstbasesrc.c
+++ b/subprojects/gstreamer/libs/gst/base/gstbasesrc.c
@@ -152,7 +152,7 @@
 #include <gst/glib-compat-private.h>
 
 #include "gstbasesrc.h"
-#include <gst/gst-i18n-lib.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_base_src_debug);
 #define GST_CAT_DEFAULT gst_base_src_debug

diff --git a/subprojects/gstreamer/libs/gst/base/gstbasetransform.c b/subprojects/gstreamer/libs/gst/base/gstbasetransform.c
index e4e7ee6..c4ed029 100644 (file)
--- a/subprojects/gstreamer/libs/gst/base/gstbasetransform.c
+++ b/subprojects/gstreamer/libs/gst/base/gstbasetransform.c
@@ -141,7 +141,7 @@
 #include <string.h>
 
 #include "../../../gst/gst_private.h"
-#include "../../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "../../../gst/glib-compat-private.h"
 #include "gstbasetransform.h"
 

diff --git a/subprojects/gstreamer/plugins/elements/gstcapsfilter.c b/subprojects/gstreamer/plugins/elements/gstcapsfilter.c
index 438f6e1..8ab961a 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstcapsfilter.c
+++ b/subprojects/gstreamer/plugins/elements/gstcapsfilter.c
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gstcapsfilter.h"
 #include "gstcoreelementselements.h"
 

diff --git a/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c b/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c
index 6d01bf9..2a6232f 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c
+++ b/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c
@@ -57,7 +57,7 @@
 
 #include <glib/gstdio.h>
 
-#include "gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gst/glib-compat-private.h"
 
 #include <string.h>

diff --git a/subprojects/gstreamer/plugins/elements/gstfdsink.c b/subprojects/gstreamer/plugins/elements/gstfdsink.c
index ad69ec0..df7b612 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstfdsink.c
+++ b/subprojects/gstreamer/plugins/elements/gstfdsink.c
@@ -36,7 +36,7 @@
 #  include "config.h"
 #endif
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 

diff --git a/subprojects/gstreamer/plugins/elements/gstfilesink.c b/subprojects/gstreamer/plugins/elements/gstfilesink.c
index ce0fba3..8802c6d 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstfilesink.c
+++ b/subprojects/gstreamer/plugins/elements/gstfilesink.c
@@ -38,7 +38,7 @@
 #  include "config.h"
 #endif
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/gst.h>
 #include <glib/gstdio.h>

diff --git a/subprojects/gstreamer/plugins/elements/gstfilesrc.c b/subprojects/gstreamer/plugins/elements/gstfilesrc.c
index 62ffb20..5dfe014 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstfilesrc.c
+++ b/subprojects/gstreamer/plugins/elements/gstfilesrc.c
@@ -79,7 +79,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,

diff --git a/subprojects/gstreamer/plugins/elements/gstidentity.c b/subprojects/gstreamer/plugins/elements/gstidentity.c
index 482147d..9037c01 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstidentity.c
+++ b/subprojects/gstreamer/plugins/elements/gstidentity.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include "gstelements_private.h"
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gstidentity.h"
 #include "gstcoreelementselements.h"
 

diff --git a/subprojects/gstreamer/plugins/elements/gstqueue.c b/subprojects/gstreamer/plugins/elements/gstqueue.c
index e381083..6955d63 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstqueue.c
+++ b/subprojects/gstreamer/plugins/elements/gstqueue.c
@@ -62,7 +62,7 @@
 #include "gstqueue.h"
 #include "gstcoreelementselements.h"
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "../../gst/glib-compat-private.h"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",

diff --git a/subprojects/gstreamer/plugins/elements/gstqueue2.c b/subprojects/gstreamer/plugins/elements/gstqueue2.c
index 6d9dad9..3373e1e 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gstqueue2.c
+++ b/subprojects/gstreamer/plugins/elements/gstqueue2.c
@@ -66,7 +66,7 @@
 
 #include <glib/gstdio.h>
 
-#include "gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gst/glib-compat-private.h"
 
 #include <string.h>

diff --git a/subprojects/gstreamer/plugins/elements/gsttypefindelement.c b/subprojects/gstreamer/plugins/elements/gsttypefindelement.c
index 41dedb2..7ba30c3 100644 (file)
--- a/subprojects/gstreamer/plugins/elements/gsttypefindelement.c
+++ b/subprojects/gstreamer/plugins/elements/gsttypefindelement.c
@@ -74,7 +74,7 @@
 
 #include "gsttypefindelement.h"
 #include "gstcoreelementselements.h"
-#include "gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gst/base/gsttypefindhelper.h"
 
 #include <gst/gsttypefind.h>

diff --git a/subprojects/gstreamer/tools/tools.h b/subprojects/gstreamer/tools/tools.h
index fb24718..bda8cf4 100644 (file)
--- a/subprojects/gstreamer/tools/tools.h
+++ b/subprojects/gstreamer/tools/tools.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #include <gst/gst.h>
-#include "gst/gst-i18n-app.h"
+#include <glib/gi18n.h>
 
 /*
  * This is a kind of hacky way to make all the tools use the same version code.