summaryrefslogtreecommitdiff
path: root/src/libffmpeg/ffmpeg_encoder.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-12 12:31:40 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-12 12:31:40 +0100
commit2e3f351aab6f653313d113f0d2ec0374c2d7aee4 (patch)
treed2243a5002904e2467767cdc92ac54522aa03a93 /src/libffmpeg/ffmpeg_encoder.c
parent3999004c72e12aa3f718ae08c1fec5d50753af65 (diff)
downloadxine-lib-2e3f351aab6f653313d113f0d2ec0374c2d7aee4.tar.gz
xine-lib-2e3f351aab6f653313d113f0d2ec0374c2d7aee4.tar.bz2
Replace usage of xine_xmalloc_aligned() with av_mallocz() from libavutil, link plugins needing it to libavutil.
Diffstat (limited to 'src/libffmpeg/ffmpeg_encoder.c')
-rw-r--r--src/libffmpeg/ffmpeg_encoder.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c
index 7fe65c7fa..f7401f6ab 100644
--- a/src/libffmpeg/ffmpeg_encoder.c
+++ b/src/libffmpeg/ffmpeg_encoder.c
@@ -61,7 +61,7 @@ typedef struct lavc_data_s {
uint8_t *ffmpeg_buffer; /* lavc buffer */
AVFrame *picture; /* picture to be encoded */
uint8_t *out[3]; /* aligned buffer for YV12 data */
- uint8_t *buf; /* unaligned YV12 buffer */
+ uint8_t *buf; /* base address of YV12 buffer */
} lavc_data_t;
@@ -108,8 +108,7 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
int image_size = frame->vo_frame.pitches[0] * frame->oheight;
- this->out[0] = xine_xmalloc_aligned(16, image_size * 3/2,
- (void *)&this->buf);
+ this->out[0] = this->buf = av_mallocz(image_size * 3/2);
this->out[1] = this->out[0] + image_size;
this->out[2] = this->out[1] + image_size/4;