diff options
| -rw-r--r-- | libmpcodecs/dec_audio.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_palette.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_scale.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h index 84be211ec3..4e9d4ac8ee 100644 --- a/libmpcodecs/dec_audio.h +++ b/libmpcodecs/dec_audio.h @@ -4,4 +4,4 @@ extern int init_audio(sh_audio_t *sh_audio); extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen); extern void resync_audio_stream(sh_audio_t *sh_audio); extern void skip_audio_frame(sh_audio_t *sh_audio); - +extern void uninit_audio(sh_audio_t *sh_audio); diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 3fa0d60fea..b9938e375a 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -2,6 +2,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif + #include "../config.h" #include "../mp_msg.h" diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c index 96810b70b2..f858757a3c 100644 --- a/libmpcodecs/vf_palette.c +++ b/libmpcodecs/vf_palette.c @@ -19,14 +19,14 @@ static unsigned int bgr_list[]={ IMGFMT_BGR24, IMGFMT_BGR16, IMGFMT_BGR15, - NULL + 0 }; static unsigned int rgb_list[]={ IMGFMT_RGB32, IMGFMT_RGB24, IMGFMT_RGB16, IMGFMT_RGB15, - NULL + 0 }; static unsigned int find_best(struct vf_instance_s* vf, unsigned int fmt){ diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 6813f28a80..9b47fb8752 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -32,7 +32,7 @@ static unsigned int outfmt_list[]={ IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, - NULL + 0 }; static unsigned int find_best_out(vf_instance_t *vf){ |