summaryrefslogtreecommitdiff
path: root/toxav
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-08-19 22:58:04 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-08-19 23:15:01 +0000
commit7aa57afebad031993825b0bd1ef0760f524e1442 (patch)
tree3e7db61a8c138215c339277d1e3b2a9227570a22 /toxav
parent0e7cc197f4da06b62de1ca200e8c2ae02c4a8818 (diff)
Avoid redefining macros from different files.
Diffstat (limited to 'toxav')
-rw-r--r--toxav/video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toxav/video.c b/toxav/video.c
index bc164cea..4f9d8c84 100644
--- a/toxav/video.c
+++ b/toxav/video.c
@@ -88,7 +88,7 @@ static const vpx_codec_iface_t *video_codec_encoder_interface(void)
88 88
89#define VPX_MAX_ENCODER_THREADS 4 89#define VPX_MAX_ENCODER_THREADS 4
90#define VPX_MAX_DECODER_THREADS 4 90#define VPX_MAX_DECODER_THREADS 4
91#define VIDEO__VP8_DECODER_POST_PROCESSING_ENABLED 0 91#define VIDEO_VP8_DECODER_POST_PROCESSING_ENABLED 0
92 92
93static void vc_init_encoder_cfg(const Logger *log, vpx_codec_enc_cfg_t *cfg, int16_t kf_max_dist) 93static void vc_init_encoder_cfg(const Logger *log, vpx_codec_enc_cfg_t *cfg, int16_t kf_max_dist)
94{ 94{
@@ -210,7 +210,7 @@ VCSession *vc_new(const Mono_Time *mono_time, const Logger *log, ToxAV *av, uint
210 goto BASE_CLEANUP; 210 goto BASE_CLEANUP;
211 } 211 }
212 212
213 if (VIDEO__VP8_DECODER_POST_PROCESSING_ENABLED == 1) { 213 if (VIDEO_VP8_DECODER_POST_PROCESSING_ENABLED == 1) {
214 vp8_postproc_cfg_t pp = {VP8_DEBLOCK, 1, 0}; 214 vp8_postproc_cfg_t pp = {VP8_DEBLOCK, 1, 0};
215 vpx_codec_err_t cc_res = vpx_codec_control(vc->decoder, VP8_SET_POSTPROC, &pp); 215 vpx_codec_err_t cc_res = vpx_codec_control(vc->decoder, VP8_SET_POSTPROC, &pp);
216 216