RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-20 06:20:40 +00:00
Code Issues Projects Releases Wiki Activity

lavc: unify similar code merged from both branches.

Browse Source
This commit is contained in:
Nicolas George 2012-03-03 10:35:36 +01:00
parent 07fb7682d1
commit b2792a436b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/utils.c
View File

@ -1219,15 +1219,10 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
avpkt->size = 0; avpkt->size = 0;
else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
avpkt->pts = avpkt->dts = frame->pts; avpkt->pts = avpkt->dts = frame->pts;
if (avpkt->data && avpkt->destruct == av_destruct_packet) {
new_data = av_realloc(avpkt->data,
avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
if (new_data)
avpkt->data = new_data;
}
if (!user_packet && avpkt->data) { if (!user_packet && avpkt->data &&
uint8_t *new_data = av_realloc(avpkt->data, avpkt->size); avpkt->destruct == av_destruct_packet) {
uint8_t *new_data = av_realloc(avpkt->data, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
if (new_data) if (new_data)
avpkt->data = new_data; avpkt->data = new_data;
} }