summaryrefslogtreecommitdiff
path: root/src/dxr3/ffmpeg_encoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/dxr3/ffmpeg_encoder.c')
-rw-r--r--src/dxr3/ffmpeg_encoder.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
index 06eee8c17..ca132167c 100644
--- a/src/dxr3/ffmpeg_encoder.c
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -38,7 +38,11 @@
#include "video_out_dxr3.h"
-#include <avcodec.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+# include <avcodec.h>
+#else
+# include <libavcodec/avcodec.h>
+#endif
/* buffer size for encoded mpeg1 stream; will hold one intra frame
* at 640x480 typical sizes are <50 kB. 512 kB should be plenty */
@@ -77,7 +81,7 @@ int dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *plugin)
avcodec_register_all();
lprintf("lavc init , version %x\n", avcodec_version());
- this = xine_xmalloc(sizeof(lavc_data_t));
+ this = calloc(1, sizeof(lavc_data_t));
if (!this) return 0;
this->encoder_data.type = ENC_LAVC;