RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Use AV_INPUT_BUFFER_PADDING_SIZE instead of deprecated one 

Signed-off-by: wm4 <wm4@nowhere>
This commit is contained in:
wang-bin 2017-02-08 22:08:49 +08:00 committed by wm4
parent c94ede9e62
commit e285e22143
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/av_common.c
View File

@ -42,7 +42,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
if (size) { if (size) {
av_free(avctx->extradata); av_free(avctx->extradata);
avctx->extradata_size = 0; avctx->extradata_size = 0;
avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!avctx->extradata) if (!avctx->extradata)
return -1; return -1;
avctx->extradata_size = size; avctx->extradata_size = size;
@ -79,7 +79,7 @@ AVCodecParameters *mp_codec_params_to_av(struct mp_codec_params *c)
avp->codec_tag = c->codec_tag; avp->codec_tag = c->codec_tag;
if (c->extradata_size) { if (c->extradata_size) {
avp->extradata = avp->extradata =
av_mallocz(c->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); av_mallocz(c->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!avp->extradata) if (!avp->extradata)
goto error; goto error;
avp->extradata_size = c->extradata_size; avp->extradata_size = c->extradata_size;

2
demux/demux_lavf.c
View File

@ -397,7 +397,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
// Disable file-extension matching with normal checks // Disable file-extension matching with normal checks
.filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "", .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
.buf_size = 0, .buf_size = 0,
.buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE), .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
}; };
if (!avpd.buf) if (!avpd.buf)
return -1; return -1;

2
demux/packet.c
View File

@ -94,7 +94,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
{ {
assert(len <= dp->len); assert(len <= dp->len);
dp->len = len; dp->len = len;
memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
} }
void free_demux_packet(struct demux_packet *dp) void free_demux_packet(struct demux_packet *dp)