summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-19 00:05:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-19 00:05:30 +0200
commit35674a29b7f6cff70e3998b5d90feb693c817196 (patch)
treececdd1c3402d9e871f9001e90ca872bd36dad6cb /libavfilter
parentcb3034e0d16e753b93dd1d879044399e45e82bf7 (diff)
vf_mp: Fix several incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_mp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 36e0c1227e..05c3fca9f0 100644
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -443,7 +443,7 @@ unsigned int vf_match_csp(vf_instance_t** vfp,const unsigned int* list,unsigned
}
mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h){
- MPContext *m= ((uint8_t*)vf) - offsetof(MPContext, next_vf);
+ MPContext *m= (MPContext*)(((uint8_t*)vf) - offsetof(MPContext, next_vf));
mp_image_t* mpi=NULL;
int w2;
int number = mp_imgtype >> 16;
@@ -615,7 +615,7 @@ int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){
goto fail;
picref->buf = pic;
- picref->buf->please_use_av_free= av_free;
+ picref->buf->please_use_av_free= (void*)av_free;
if (!(picref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps))))
goto fail;