[FFmpeg-devel] [PATCH] swscale-example: use av_malloc()
Mans Rullgard
mans
Tue Jan 19 03:20:02 CET 2010
Image buffers require 16-byte alignment, so av_malloc() should be used.
Fixes crash on PPC.
---
swscale-example.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/swscale-example.c b/swscale-example.c
index 9bb661e..f0f1d5e 100644
--- a/swscale-example.c
+++ b/swscale-example.c
@@ -25,6 +25,7 @@
#include <stdarg.h>
#undef HAVE_AV_CONFIG_H
+#include "libavutil/mem.h"
#include "libavutil/avutil.h"
#include "libavutil/lfg.h"
#include "swscale.h"
@@ -101,9 +102,9 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
else
dstStride[i]= dstW*4;
- src[i]= malloc(srcStride[i]*srcH);
- dst[i]= malloc(dstStride[i]*dstH);
- out[i]= malloc(refStride[i]*h);
+ src[i]= av_malloc(srcStride[i]*srcH);
+ dst[i]= av_malloc(dstStride[i]*dstH);
+ out[i]= av_malloc(refStride[i]*h);
if (!src[i] || !dst[i] || !out[i]) {
perror("Malloc");
res = -1;
@@ -216,10 +217,10 @@ static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h)
int main(int argc, char **argv)
{
- uint8_t *rgb_data = malloc (W*H*4);
+ uint8_t *rgb_data = av_malloc (W*H*4);
uint8_t *rgb_src[3]= {rgb_data, NULL, NULL};
int rgb_stride[3]={4*W, 0, 0};
- uint8_t *data = malloc (4*W*H);
+ uint8_t *data = av_malloc (4*W*H);
uint8_t *src[4]= {data, data+W*H, data+W*H*2, data+W*H*3};
int stride[4]={W, W, W, W};
int x, y;
--
1.6.6
More information about the ffmpeg-devel
mailing list