RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat: add ff_alloc_extradata() helper 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-10-13 10:19:09 +00:00
parent fe448cd28d
commit 3fd79833e2
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/internal.h
View File

@ -361,4 +361,13 @@ AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precissi
*/ */
void ff_generate_avci_extradata(AVStream *st); void ff_generate_avci_extradata(AVStream *st);
/**
* Allocate extradata with additional FF_INPUT_BUFFER_PADDING_SIZE at end
* which is always set to 0.
*
* @param size size of extradata
* @return 0 if OK, AVERROR_xxx on error
*/
int ff_alloc_extradata(AVCodecContext *avctx, int size);
#endif /* AVFORMAT_INTERNAL_H */ #endif /* AVFORMAT_INTERNAL_H */

20
libavformat/utils.c
View File

@ -2678,6 +2678,26 @@ int av_find_stream_info(AVFormatContext *ic)
} }
#endif #endif
int ff_alloc_extradata(AVCodecContext *avctx, int size)
{
int ret;
if (size < 0 || size >= INT32_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
avctx->extradata_size = 0;
return AVERROR(EINVAL);
}
avctx->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
if (avctx->extradata) {
memset(avctx->extradata + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
avctx->extradata_size = size;
ret = 0;
} else {
avctx->extradata_size = 0;
ret = AVERROR(ENOMEM);
}
return ret;
}
int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
{ {
int i, count, ret = 0, j; int i, count, ret = 0, j;