generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'

Browse Source 
* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
  avcodec: Use av_reallocp where suitable

Conflicts:
	libavcodec/bitstream.c
	libavcodec/eatgv.c
	libavcodec/flashsv.c
	libavcodec/libtheoraenc.c
	libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-09 20:31:29 +01:00
parent 94a849b8b6 9b8d11a76a
commit 8c677a9f06
10 changed files with 65 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/h264_mp4toannexb_bsf.c
View File

@@ -37,13 +37,14 @@ static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
{
uint32_t offset = *poutbuf_size;
uint8_t nal_header_size = offset ? 3 : 4;
void *tmp;
int err;
*poutbuf_size += sps_pps_size + in_size + nal_header_size;
tmp = av_realloc(*poutbuf, *poutbuf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!tmp)
return AVERROR(ENOMEM);
*poutbuf = tmp;
if ((err = av_reallocp(poutbuf,
*poutbuf_size + FF_INPUT_BUFFER_PADDING_SIZE)) < 0) {
*poutbuf_size = 0;
return err;
}
if (sps_pps)
memcpy(*poutbuf + offset, sps_pps, sps_pps_size);
memcpy(*poutbuf + sps_pps_size + nal_header_size + offset, in, in_size);
@@ -77,7 +78,7 @@ static int h264_extradata_to_annexb(AVCodecContext *avctx, const int padding)
}
while (unit_nb--) {
void *tmp;
int err;
unit_size = AV_RB16(extradata);
total_size += unit_size + 4;
@@ -93,12 +94,8 @@ static int h264_extradata_to_annexb(AVCodecContext *avctx, const int padding)
av_free(out);
return AVERROR(EINVAL);
}
tmp = av_realloc(out, total_size + padding);
if (!tmp) {
av_free(out);
return AVERROR(ENOMEM);
}
out = tmp;
if ((err = av_reallocp(&out, total_size + padding)) < 0)
return err;
memcpy(out + total_size - unit_size - 4, nalu_header, 4);
memcpy(out + total_size - unit_size, extradata + 2, unit_size);
extradata += 2 + unit_size;