[FFmpeg-cvslog] Merge commit '8996515b137f962e3a8691241c285c96437b6c53'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 22 19:32:00 2016 +0200| [17fdffc9f80e65bae45d2a936425623705dddb19] | committer: Clément Bœsch

Merge commit '8996515b137f962e3a8691241c285c96437b6c53'

* commit '8996515b137f962e3a8691241c285c96437b6c53':
  avpacket: fix setting AVPacket.data in av_packet_ref()

This commit is a noop, see ed3a02547c71ac06fa27f17ad53116a74f78d927

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17fdffc9f80e65bae45d2a936425623705dddb19
---

 libavcodec/avpacket.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 8988ca2..92186892 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -582,6 +582,7 @@ int av_packet_ref(AVPacket *dst, const 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);


======================================================================