summaryrefslogtreecommitdiff
path: root/src/combined/ffmpeg/ffmpeg_encoder.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
commit4527fd438b39dc312c69839f051e0a2ac0046356 (patch)
treed3b2dc1f89617e86c619575e3324534c523ed673 /src/combined/ffmpeg/ffmpeg_encoder.c
parent47c1651eb8c42ab6dddaff7c0663c45ac49b4fcf (diff)
parent88d23a2dbabf419ab4014b449be119a741aa54f5 (diff)
downloadxine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.gz
xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.bz2
Merge file removal.
Diffstat (limited to 'src/combined/ffmpeg/ffmpeg_encoder.c')
-rw-r--r--src/combined/ffmpeg/ffmpeg_encoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_encoder.c b/src/combined/ffmpeg/ffmpeg_encoder.c
index 2d1be10a3..84243a56f 100644
--- a/src/combined/ffmpeg/ffmpeg_encoder.c
+++ b/src/combined/ffmpeg/ffmpeg_encoder.c
@@ -78,7 +78,7 @@ int dxr3_encoder_init(dxr3_driver_t *drv)
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;