diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-22 19:32:00 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-22 19:32:00 +0200 |
| commit | 17fdffc9f80e65bae45d2a936425623705dddb19 (patch) | |
| tree | 3795f4430b1909607fb65a40221deb27daf414eb | |
| parent | d4b1b3b06c210be9088eb0940acca0a914b6b916 (diff) | |
| parent | 8996515b137f962e3a8691241c285c96437b6c53 (diff) | |
| download | ffmpeg-17fdffc9f80e65bae45d2a936425623705dddb19.tar.gz | |
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@pkh.me>
| -rw-r--r-- | libavcodec/avpacket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 8988ca20d9..9218689239 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); |