Browse Source

avformat/utils: simplify ff_alloc_extradata()

Cosmetic refactor

Reviewed-by: 74a2fa708a
Signed-off-by: James Almer <jamrial@gmail.com>
tags/n4.0
James Almer 8 years ago
parent
commit
2aa42fac77
1 changed files with 11 additions and 15 deletions
  1. +11
    -15
      libavformat/utils.c

+ 11
- 15
libavformat/utils.c View File

@@ -3243,24 +3243,20 @@ static int tb_unreliable(AVCodecContext *c)

int ff_alloc_extradata(AVCodecParameters *par, int size)
{
int ret;

av_freep(&par->extradata);
if (size < 0 || size >= INT32_MAX - AV_INPUT_BUFFER_PADDING_SIZE) {
par->extradata = NULL;
par->extradata_size = 0;
par->extradata_size = 0;
if (size < 0 || size >= INT32_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
return AVERROR(EINVAL);
}
par->extradata = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (par->extradata) {
memset(par->extradata + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
par->extradata_size = size;
ret = 0;
} else {
par->extradata_size = 0;
ret = AVERROR(ENOMEM);
}
return ret;
if (!par->extradata)
return AVERROR(ENOMEM);

memset(par->extradata + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
par->extradata_size = size;

return 0;
}

int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb, int size)


Loading…
Cancel
Save