summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-10 15:51:16 +0200
committerwm4 <wm4@nowhere>2017-10-10 15:51:16 +0200
commit14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6 (patch)
tree14f622db59a3fd0265fd4e6541cedb6781879dde
parent7c66c2bb75bb9f252dc976ab1805fecc610438e7 (diff)
downloadmpv-14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6.tar.bz2
mpv-14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6.tar.xz
Add checks for HAVE_GPL to various GPL-only source files
This should actually cover all of them, if you take into account that some unchanged GPL source files include header files with such checks. Also this was done already for the libaf derived code. This is only for "safety" and to avoid misunderstandings.
-rw-r--r--audio/out/ao_alsa.c4
-rw-r--r--audio/out/ao_jack.c4
-rw-r--r--audio/out/ao_oss.c4
-rw-r--r--stream/audio_in.h4
-rw-r--r--stream/dvbin.h4
-rw-r--r--stream/frequencies.h5
-rw-r--r--stream/stream_cdda.c5
-rw-r--r--stream/stream_dvb.c4
-rw-r--r--stream/stream_dvd_common.h5
-rw-r--r--stream/stream_dvdnav.c4
-rw-r--r--stream/stream_smb.c5
-rw-r--r--stream/tv.h5
-rw-r--r--video/filter/vf_crop.c5
-rw-r--r--video/filter/vf_dsize.c5
-rw-r--r--video/filter/vf_expand.c5
-rw-r--r--video/filter/vf_flip.c5
-rw-r--r--video/filter/vf_format.c5
-rw-r--r--video/filter/vf_gradfun.c5
-rw-r--r--video/filter/vf_mirror.c5
-rw-r--r--video/filter/vf_noformat.c5
-rw-r--r--video/filter/vf_pullup.c5
-rw-r--r--video/filter/vf_rotate.c5
-rw-r--r--video/filter/vf_scale.c5
-rw-r--r--video/filter/vf_stereo3d.c5
-rw-r--r--video/filter/vf_sub.c5
-rw-r--r--video/filter/vf_yadif.c5
-rw-r--r--video/out/opengl/hwdec_vaglx.c5
-rw-r--r--video/out/vo_caca.c5
-rw-r--r--video/out/vo_direct3d.c5
-rw-r--r--video/out/x11_common.h5
-rw-r--r--video/vdpau.h5
31 files changed, 148 insertions, 0 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 900cbafd03..050aef4e2c 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -49,6 +49,10 @@
#include "internal.h"
#include "audio/format.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct ao_alsa_opts {
char *mixer_device;
char *mixer_name;
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 597835c989..b5413f77cf 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -40,6 +40,10 @@
#include <jack/jack.h>
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct jack_opts {
char *port;
char *client_name;
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index eebd9622e7..72413cd9f8 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -49,6 +49,10 @@
#include "ao.h"
#include "internal.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
// Define to 0 if the device must be reopened to reset it (stop all playback,
// clear the buffer), and the device should be closed when unused.
// Define to 1 if SNDCTL_DSP_RESET should be used to reset without close.
diff --git a/stream/audio_in.h b/stream/audio_in.h
index 28d7d335cf..6b714f7306 100644
--- a/stream/audio_in.h
+++ b/stream/audio_in.h
@@ -24,6 +24,10 @@
#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct mp_log;
#if HAVE_ALSA
diff --git a/stream/dvbin.h b/stream/dvbin.h
index 5329179b0f..284ccbd450 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -11,6 +11,10 @@
#include "config.h"
#include "stream.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
#define SLOF (11700 * 1000UL)
#define LOF1 (9750 * 1000UL)
#define LOF2 (10600 * 1000UL)
diff --git a/stream/frequencies.h b/stream/frequencies.h
index be4a33a519..e215d023b5 100644
--- a/stream/frequencies.h
+++ b/stream/frequencies.h
@@ -125,4 +125,9 @@ struct CHANLISTS {
extern const struct CHANLISTS chanlists[];
extern const int chancount;
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
#endif /* MPLAYER_FREQUENCIES_H */
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 2a8eb7553f..7fd461a361 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -46,6 +46,11 @@
#include "common/msg.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
typedef struct cdda_params {
cdrom_drive_t *cd;
cdrom_paranoia_t *cdp;
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 7514e42fc0..c53753ad31 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -58,6 +58,10 @@
#include "dvbin.h"
#include "dvb_tune.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
#define MAX_ADAPTERS 16
#define CHANNEL_LINE_LEN 256
#define min(a, b) ((a) <= (b) ? (a) : (b))
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 8caa2819cf..dccf49246c 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -22,6 +22,11 @@
#include <stdbool.h>
#include "stream.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
extern const char * const dvd_audio_stream_channels[6];
extern const char * const dvd_audio_stream_types[8];
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index fc7ddfdc58..16a3d11d70 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -19,6 +19,10 @@
#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index 79243a4c79..4376f71ee6 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -26,6 +26,11 @@
#include "stream.h"
#include "options/m_option.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct priv {
int fd;
};
diff --git a/stream/tv.h b/stream/tv.h
index 64be22298b..f37e715515 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -26,6 +26,11 @@
#include "osdep/endian.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct mp_log;
typedef struct tv_params {
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index 79a2fce88c..495abf65c7 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -29,6 +29,11 @@
#include "options/m_option.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
static const struct vf_priv_s {
int crop_w,crop_h;
int crop_x,crop_y;
diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c
index 27d21c085e..12fa7242f3 100644
--- a/video/filter/vf_dsize.c
+++ b/video/filter/vf_dsize.c
@@ -29,6 +29,11 @@
#include "video/mp_image.h"
#include "vf.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
int w, h;
int method; // aspect method, 0 -> downscale, 1-> upscale. +2 -> original aspect.
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index 216c47a6ac..398d90ecba 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -32,6 +32,11 @@
#include "options/m_option.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
static struct vf_priv_s {
// These four values are a backup of the values parsed from the command line.
// This is necessary so that we do not get a mess upon filter reinit due to
diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c
index 30658e48dd..776f127fa1 100644
--- a/video/filter/vf_flip.c
+++ b/video/filter/vf_flip.c
@@ -27,6 +27,11 @@
#include "video/out/vo.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
{
mp_image_vflip(mpi);
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index 581bbe332f..ebbbc584fc 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -32,6 +32,11 @@
#include "options/m_option.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
int fmt;
int outfmt;
diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c
index c34b77f82a..33bc883c61 100644
--- a/video/filter/vf_gradfun.c
+++ b/video/filter/vf_gradfun.c
@@ -29,6 +29,11 @@
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
float cfg_thresh;
int cfg_radius;
diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c
index f835d38130..91cc9a5503 100644
--- a/video/filter/vf_mirror.c
+++ b/video/filter/vf_mirror.c
@@ -20,6 +20,11 @@
#include "vf.h"
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
static int vf_open(vf_instance_t *vf)
{
MP_WARN(vf, "This filter is deprecated. Use lavfi hflip instead.\n");
diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c
index 2d3985c216..b6a71d9417 100644
--- a/video/filter/vf_noformat.c
+++ b/video/filter/vf_noformat.c
@@ -29,6 +29,11 @@
#include "options/m_option.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
static struct vf_priv_s {
int fmt;
} const vf_priv_dflt = {
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index eee6f43d7f..83d5f177b3 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -26,6 +26,11 @@
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
struct pullup_context *ctx;
int init;
diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c
index be1247f4e9..443a0dac42 100644
--- a/video/filter/vf_rotate.c
+++ b/video/filter/vf_rotate.c
@@ -27,6 +27,11 @@
#include "vf.h"
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
int angle;
int warn;
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 9c74db363d..28508e4466 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -41,6 +41,11 @@
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
static struct vf_priv_s {
int w, h;
int cfg_w, cfg_h;
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index 51cfff8afa..3d29dcd8e8 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -36,6 +36,11 @@
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
//==types==//
typedef enum stereo_code {
ANAGLYPH_RC_GRAY, //anaglyph red/cyan gray
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index 184ab8deb3..fdaee80937 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -40,6 +40,11 @@
#include "options/m_option.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
int opt_top_margin, opt_bottom_margin;
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index e044dcc6d7..3eee572a5f 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -28,6 +28,11 @@
#include "vf_lavfi.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vf_priv_s {
int mode;
int interlaced_only;
diff --git a/video/out/opengl/hwdec_vaglx.c b/video/out/opengl/hwdec_vaglx.c
index d5bc0b6ee7..2ad7970859 100644
--- a/video/out/opengl/hwdec_vaglx.c
+++ b/video/out/opengl/hwdec_vaglx.c
@@ -30,6 +30,11 @@
#include "ra_gl.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct priv_owner {
struct mp_vaapi_ctx *ctx;
VADisplay *display;
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index 46090afc4a..e63bd69b1d 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -42,6 +42,11 @@
#include "common/msg.h"
#include "input/input.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct priv {
caca_canvas_t *canvas;
caca_display_t *display;
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 952dca85ce..a131d210cb 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -40,6 +40,11 @@
#include "w32_common.h"
#include "sub/osd.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
// shaders generated by fxc.exe from d3d_shader_yuv.hlsl
#include "d3d_shader_420p.h"
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index e69640cc64..1c0096329c 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -29,6 +29,11 @@
#include "common/common.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
struct vo;
struct mp_log;
diff --git a/video/vdpau.h b/video/vdpau.h
index b320fa525a..a224229cbb 100644
--- a/video/vdpau.h
+++ b/video/vdpau.h
@@ -12,6 +12,11 @@
#include "common/msg.h"
#include "hwdec.h"
+#include "config.h"
+#if !HAVE_GPL
+#error GPL only
+#endif
+
#define CHECK_VDP_ERROR_ST(ctx, message, statement) \
do { \
if (vdp_st != VDP_STATUS_OK) { \