mirror of https://git.ffmpeg.org/ffmpeg.git
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.
This commit is contained in:
parent
d584533cf3
commit
9b56d5c114
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
*
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue