Browse Source

Drop some pointless void* return value casts from av_malloc() invocations.

tags/n0.10
Diego Biurrun 14 years ago
parent
commit
44b0edda3f
4 changed files with 7 additions and 7 deletions
  1. +1
    -1
      libavcodec/imgconvert.c
  2. +3
    -3
      libavcodec/snow.c
  3. +1
    -1
      libavformat/rmenc.c
  4. +2
    -2
      libswscale/colorspace-test.c

+ 1
- 1
libavcodec/imgconvert.c View File

@@ -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);


+ 3
- 3
libavcodec/snow.c View File

@@ -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++){


+ 1
- 1
libavformat/rmenc.c View File

@@ -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));



+ 2
- 2
libswscale/colorspace-test.c View File

@@ -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;



Loading…
Cancel
Save