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.
This commit is contained in:
wm4 committed 2017-10-10 15:51:16 +02:00
1 parent 7c66c2bb75
commit 14541ae258
31 files changed
+148

No files matched your search

+4
View File
@@ -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;
+4
View File
@@ -40,6 +40,10 @@
#include <jack/jack.h>
#if !HAVE_GPL
#error GPL only
#endif
struct jack_opts {
char *port;
char *client_name;
+4
View File
@@ -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.
+4
View File
@@ -24,6 +24,10 @@
#include "config.h"
#if !HAVE_GPL
#error GPL only
#endif
struct mp_log;
#if HAVE_ALSA
+4
View File
@@ -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)
+5
View File
@@ -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 */
+5
View File
@@ -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;
+4
View File
@@ -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))
+5
View File
@@ -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];
+4
View File
@@ -19,6 +19,10 @@
#include "config.h"
#if !HAVE_GPL
#error GPL only
#endif
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
+5
View File
@@ -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;
};
+5
View File
@@ -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 {
+5
View File
@@ -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;
+5
View File
@@ -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.
+5
View File
@@ -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
+5
View File
@@ -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);
+5
View File
@@ -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;
+5
View File
@@ -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;
+5
View File
@@ -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");
+5
View File
@@ -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 = {
+5
View File
@@ -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;
+5
View File
@@ -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;
+5
View File
@@ -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;
+5
View File
@@ -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
+5
View File
@@ -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;
+5
View File
@@ -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;
+5
View File
@@ -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;
+5
View File
@@ -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;
+5
View File
@@ -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"
+5
View File
@@ -29,6 +29,11 @@
#include "common/common.h"
#include "config.h"
#if !HAVE_GPL
#error GPL only
#endif
struct vo;
struct mp_log;
+5
View File
@@ -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) { \