diff --git a/codec.c b/codec.c
index ea8d8f8..6605a40 100644
--- a/codec.c
+++ b/codec.c
@@ -128,7 +128,7 @@ static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame)
 	struct vdpau_render_state *vrs;
 
 	surface = VideoGetSurface(decoder->HwDecoder);
-	vrs = av_calloc(1, sizeof(struct vdpau_render_state));
+	vrs = av_mallocz(sizeof(struct vdpau_render_state));
 	vrs->surface = surface;
 
 	//Debug(3, "codec: use surface %#010x\n", surface);
@@ -229,6 +229,11 @@ static void Codec_release_buffer(AVCodecContext * video_ctx, AVFrame * frame)
     return avcodec_default_release_buffer(video_ctx, frame);
 }
 
+/// libav: compatibility hack
+#ifndef AV_NUM_DATA_POINTERS
+#define AV_NUM_DATA_POINTERS	4
+#endif
+
 /**
 **	Draw a horizontal band.
 **