avpacket: fix setting AVPacket.data in av_packet_ref()

Message ID 20161124222957.4F1265DACC@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Nov. 24, 2016, 10:29 p.m.
Module: libav
Branch: master
Commit: 8996515b137f962e3a8691241c285c96437b6c53

Author:    Anton Khirnov <anton@khirnov.net>
Committer: Anton Khirnov <anton@khirnov.net>
Date:      Thu May 12 15:34:58 2016 +0200

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

---

 libavcodec/avpacket.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

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);