diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 11:01:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 11:01:26 +0200 |
| commit | 20dfab33f5ab61fc51de65192ed239f8b62782a2 (patch) | |
| tree | f5164b3f79ab48e4dd4c027bef968666f7748716 /libavformat/avidec.c | |
| parent | f54d751f33375054d4ecf30301ef008c8e781f99 (diff) | |
| parent | 5626f994f273af80fb100d4743b963304de9e05c (diff) | |
| download | ffmpeg-20dfab33f5ab61fc51de65192ed239f8b62782a2.tar.gz | |
Merge commit '5626f994f273af80fb100d4743b963304de9e05c'
* commit '5626f994f273af80fb100d4743b963304de9e05c':
avformat: Use av_reallocp() where suitable
Conflicts:
libavformat/avidec.c
libavformat/avienc.c
libavformat/aviobuf.c
libavformat/oggparsevorbis.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index ff20b7c0d8..c89006c2cf 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -692,11 +692,11 @@ static int avi_read_header(AVFormatContext *s) if (st->codec->codec_tag == 0 && st->codec->height > 0 && st->codec->extradata_size < 1U << 30) { st->codec->extradata_size += 9; - st->codec->extradata = av_realloc_f(st->codec->extradata, - 1, - st->codec->extradata_size + - FF_INPUT_BUFFER_PADDING_SIZE); - if (st->codec->extradata) + if ((ret = av_reallocp(&st->codec->extradata, + st->codec->extradata_size + + FF_INPUT_BUFFER_PADDING_SIZE)) < 0) + return ret; + else memcpy(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9); } |