summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-10-23 11:11:33 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-10-26 18:00:55 +0100
commit9b56d5c11488656254e9aed8d964ef2b7c2ff5e6 (patch)
tree83fe8dc6bd2410a174d214400dcf1dca290e7f49
parentd584533cf38141172e20bae5436629ee17c8ce50 (diff)
avpacket: Deprecate av_dup_packet
As documented, `av_dup_packet` is broken by design, `av_packet_ref` matches the AVFrame ref-counted API and can be safely used instead.
-rw-r--r--doc/APIchanges8
-rw-r--r--libavcodec/avcodec.h5
-rw-r--r--libavcodec/avpacket.c4
-rw-r--r--libavformat/matroskaenc.c7
-rw-r--r--libavformat/mux.c10
5 files changed, 18 insertions, 16 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 590f192a46..0c5d141101 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,9 +13,11 @@ libavutil: 2015-08-28
API changes, most recent first:
-2015-xx-xx - xxxxxxx - lavc 57.7.0 - avcodec.h
- Deprecate av_free_packet(). Use av_packet_unref() as replacement,
- it resets the packet in a more consistent way.
+2015-xx-xx - lavc 57.7.0 - avcodec.h
+ xxxxxx - Deprecate av_free_packet(). Use av_packet_unref() as replacement,
+ it resets the packet in a more consistent way.
+ xxxxxx - Deprecate av_dup_packet(), it is a no-op for most cases.
+ Use av_packet_ref() to make a non-refcounted AVPacket refcounted.
2015-xx-xx - xxxxxxx - lavc 57.5.0 - avcodec.h
Add data and linesize array to AVSubtitleRect, to be used instead of
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index dfd18ba866..9eaa2c6ffb 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3476,12 +3476,15 @@ int av_grow_packet(AVPacket *pkt, int grow_by);
*/
int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
+#if FF_API_AVPACKET_OLD_API
/**
* @warning This is a hack - the packet memory allocation stuff is broken. The
* packet is allocated if it was not really allocated.
+ *
+ * @deprecated Use av_packet_ref
*/
+attribute_deprecated
int av_dup_packet(AVPacket *pkt);
-#if FF_API_AVPACKET_OLD_API
/**
* Free a packet.
*
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index eaea061c54..cec5bf89c3 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -128,6 +128,8 @@ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size)
return 0;
}
+#if FF_API_AVPACKET_OLD_API
+FF_DISABLE_DEPRECATION_WARNINGS
#define ALLOC_MALLOC(data, size) data = av_malloc(size)
#define ALLOC_BUF(data, size) \
do { \
@@ -187,6 +189,8 @@ failed_alloc:
av_packet_unref(pkt);
return AVERROR(ENOMEM);
}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
void av_packet_free_side_data(AVPacket *pkt)
{
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index f1bd272672..baffd54340 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1608,12 +1608,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
// buffer an audio packet to ensure the packet containing the video
// keyframe's timecode is contained in the same cluster for WebM
if (codec_type == AVMEDIA_TYPE_AUDIO) {
- mkv->cur_audio_pkt = *pkt;
- if (pkt->buf) {
- mkv->cur_audio_pkt.buf = av_buffer_ref(pkt->buf);
- ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM);
- } else
- ret = av_dup_packet(&mkv->cur_audio_pkt);
+ ret = av_packet_ref(&mkv->cur_audio_pkt, pkt);
} else
ret = mkv_write_packet_internal(s, pkt);
return ret;
diff --git a/libavformat/mux.c b/libavformat/mux.c
index e86d202713..4a81e36af5 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -416,12 +416,8 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
this_pktl = av_mallocz(sizeof(AVPacketList));
if (!this_pktl)
return AVERROR(ENOMEM);
- this_pktl->pkt = *pkt;
- pkt->buf = NULL;
- pkt->side_data = NULL;
- pkt->side_data_elems = 0;
- // Duplicate the packet if it uses non-allocated memory
- if ((ret = av_dup_packet(&this_pktl->pkt)) < 0) {
+
+ if ((ret = av_packet_ref(&this_pktl->pkt, pkt)) < 0) {
av_free(this_pktl);
return ret;
}
@@ -450,6 +446,8 @@ next_non_null:
s->streams[pkt->stream_index]->last_in_packet_buffer =
*next_point = this_pktl;
+ av_packet_unref(pkt);
+
return 0;
}