summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-06-12 22:12:17 +0200
committerDiego Biurrun <diego@biurrun.de>2017-06-21 12:24:13 +0200
commitf519e131c101ae3948dabf1f7f598efbff5fb536 (patch)
tree63fe9398b5be338957bbb166a86ace32116938f7
parenteb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888 (diff)
af_bs2b: Add missing casts to complex pointer assignments
Fixes several warnings of the type: libavfilter/af_bs2b.c:171:22: warning: assignment from incompatible pointer type
-rw-r--r--libavfilter/af_bs2b.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c
index 25e786761f..0468333a87 100644
--- a/libavfilter/af_bs2b.c
+++ b/libavfilter/af_bs2b.c
@@ -32,6 +32,8 @@
#include "formats.h"
#include "internal.h"
+typedef void (*filter_func)(t_bs2bdp bs2bdp, uint8_t *sample, int n);
+
typedef struct Bs2bContext {
const AVClass *class;
@@ -41,7 +43,7 @@ typedef struct Bs2bContext {
t_bs2bdp bs2bp;
- void (*filter)(t_bs2bdp bs2bdp, uint8_t *sample, int n);
+ filter_func filter;
} Bs2bContext;
#define OFFSET(x) offsetof(Bs2bContext, x)
@@ -165,19 +167,19 @@ static int config_output(AVFilterLink *outlink)
switch (inlink->format) {
case AV_SAMPLE_FMT_U8:
- bs2b->filter = bs2b_cross_feed_u8;
+ bs2b->filter = (filter_func) bs2b_cross_feed_u8;
break;
case AV_SAMPLE_FMT_S16:
- bs2b->filter = bs2b_cross_feed_s16;
+ bs2b->filter = (filter_func) bs2b_cross_feed_s16;
break;
case AV_SAMPLE_FMT_S32:
- bs2b->filter = bs2b_cross_feed_s32;
+ bs2b->filter = (filter_func) bs2b_cross_feed_s32;
break;
case AV_SAMPLE_FMT_FLT:
- bs2b->filter = bs2b_cross_feed_f;
+ bs2b->filter = (filter_func) bs2b_cross_feed_f;
break;
case AV_SAMPLE_FMT_DBL:
- bs2b->filter = bs2b_cross_feed_d;
+ bs2b->filter = (filter_func) bs2b_cross_feed_d;
break;
default:
return AVERROR_BUG;