avpacket: fix setting AVPacket.data in av_packet_ref()

The data field does not necessarily point to the beginning of the
underlying AVBuffer.

CC: libav-stable@libav.org
This commit is contained in:
Anton Khirnov 2016-05-12 15:34:58 +02:00
parent e62ff72fc1
commit 8996515b13
1 changed files with 4 additions and 1 deletions

View File

@ -365,16 +365,19 @@ int av_packet_ref(AVPacket *dst, AVPacket *src)
if (ret < 0)
goto fail;
memcpy(dst->buf->data, src->data, src->size);
dst->data = dst->buf->data;
} else {
dst->buf = av_buffer_ref(src->buf);
if (!dst->buf) {
ret = AVERROR(ENOMEM);
goto fail;
}
dst->data = src->data;
}
dst->size = src->size;
dst->data = dst->buf->data;
return 0;
fail:
av_packet_free_side_data(dst);