ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Thu May 12 15:34:58 2016 +0200| [8996515b137f962e3a8691241c285c96437b6c53] | committer: Anton Khirnov
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-sta...@libav.org > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8996515b137f962e3a8691241c285c96437b6c53 --- libavcodec/avpacket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 59fc6f2..04d6244 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
