diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-12-31 16:30:59 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-01-02 16:41:24 +0100 |
| commit | 44b0edda3f4f8006c16e1b124199cafaf6363f3d (patch) | |
| tree | 57684e719597a73517666eba9504ddc78f12d954 | |
| parent | 3a1867deac3112b925648b07737be26f4b13f33a (diff) | |
| download | ffmpeg-44b0edda3f4f8006c16e1b124199cafaf6363f3d.tar.gz | |
Drop some pointless void* return value casts from av_malloc() invocations.
| -rw-r--r-- | libavcodec/imgconvert.c | 2 | ||||
| -rw-r--r-- | libavcodec/snow.c | 6 | ||||
| -rw-r--r-- | libavformat/rmenc.c | 2 | ||||
| -rw-r--r-- | libswscale/colorspace-test.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index eb398f7107..eab051bacc 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -1000,7 +1000,7 @@ static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap, uint8_t *src_m1, *src_0, *src_p1, *src_p2; int y; uint8_t *buf; - buf = (uint8_t*)av_malloc(width); + buf = av_malloc(width); src_m1 = src1; memcpy(buf,src_m1,width); diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 447289aa74..545f883541 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -516,9 +516,9 @@ static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *fr int ls= frame->linesize[p]; uint8_t *src= frame->data[p]; - halfpel[1][p]= (uint8_t*)av_malloc(ls * (h+2*EDGE_WIDTH)) + EDGE_WIDTH*(1+ls); - halfpel[2][p]= (uint8_t*)av_malloc(ls * (h+2*EDGE_WIDTH)) + EDGE_WIDTH*(1+ls); - halfpel[3][p]= (uint8_t*)av_malloc(ls * (h+2*EDGE_WIDTH)) + EDGE_WIDTH*(1+ls); + halfpel[1][p] = av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls); + halfpel[2][p] = av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls); + halfpel[3][p] = av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls); halfpel[0][p]= src; for(y=0; y<h; y++){ diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 0846a0ac15..0312d161c7 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -355,7 +355,7 @@ static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int int i; /* XXX: suppress this malloc */ - buf1= (uint8_t*) av_malloc( size * sizeof(uint8_t) ); + buf1 = av_malloc(size * sizeof(uint8_t)); write_packet_header(s, stream, size, !!(flags & AV_PKT_FLAG_KEY)); diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c index 07c1cbd803..ac3bb71f31 100644 --- a/libswscale/colorspace-test.c +++ b/libswscale/colorspace-test.c @@ -36,8 +36,8 @@ int main(int argc, char **argv) { int i, funcNum; - uint8_t *srcBuffer= (uint8_t*)av_malloc(SIZE); - uint8_t *dstBuffer= (uint8_t*)av_malloc(SIZE); + uint8_t *srcBuffer = av_malloc(SIZE); + uint8_t *dstBuffer = av_malloc(SIZE); int failedNum=0; int passedNum=0; |