[FFmpeg-devel] [PATCH] avcodec/encode: remove usage of av_dup_packet()
James Almer
jamrial at gmail.com
Mon Oct 2 05:17:59 EEST 2017
Signed-off-by: James Almer <jamrial at gmail.com>
---
libavcodec/encode.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index 525ee1f5d6..dd50486bcf 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -222,10 +222,12 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
}
avpkt->buf = user_pkt.buf;
avpkt->data = user_pkt.data;
- } else {
- if (av_dup_packet(avpkt) < 0) {
- ret = AVERROR(ENOMEM);
- }
+ } else if (!avpkt->buf) {
+ AVPacket tmp = { 0 };
+ ret = av_packet_ref(&tmp, avpkt);
+ if (ret < 0)
+ return ret;
+ *avpkt = tmp;
}
}
@@ -318,10 +320,12 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
}
avpkt->buf = user_pkt.buf;
avpkt->data = user_pkt.data;
- } else {
- if (av_dup_packet(avpkt) < 0) {
- ret = AVERROR(ENOMEM);
- }
+ } else if (!avpkt->buf) {
+ AVPacket tmp = { 0 };
+ ret = av_packet_ref(&tmp, avpkt);
+ if (ret < 0)
+ return ret;
+ *avpkt = tmp;
}
}
--
2.14.1
More information about the ffmpeg-devel
mailing list