diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
commit | 87c88122703f2befcf96383d05bdf14373c22df9 (patch) | |
tree | 440194d29f606b9926ad57b9a15d0709ee12ccd7 /libavcodec | |
parent | b27ddffbfb29f456d43c2f155eef5230b940a48b (diff) | |
parent | 01bcc2d5c23fa757d163530abb396fd02f1be7c8 (diff) |
Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/avcodec.h | 16 | ||||
-rw-r--r-- | libavcodec/avpacket.c | 48 | ||||
-rw-r--r-- | libavcodec/utils.c | 10 | ||||
-rw-r--r-- | libavcodec/version.h | 3 |
4 files changed, 1 insertions, 76 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a471575098..fae48a8ed7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1439,12 +1439,7 @@ typedef struct AVPacket { * Equals next_pts - this_pts in presentation order. */ int duration; -#if FF_API_DESTRUCT_PACKET - attribute_deprecated - void (*destruct)(struct AVPacket *); - attribute_deprecated - void *priv; -#endif + int64_t pos; ///< byte position in stream, -1 if unknown /** @@ -4010,15 +4005,6 @@ void avsubtitle_free(AVSubtitle *sub); * @{ */ -#if FF_API_DESTRUCT_PACKET -/** - * Default packet destructor. - * @deprecated use the AVBuffer API instead - */ -attribute_deprecated -void av_destruct_packet(AVPacket *pkt); -#endif - /** * Initialize optional fields of a packet with default values. * diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 10be9d53b8..7b2df14a37 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -30,22 +30,6 @@ #include "bytestream.h" #include "internal.h" -#if FF_API_DESTRUCT_PACKET - -void av_destruct_packet(AVPacket *pkt) -{ - av_freep(&pkt->data); - pkt->size = 0; -} - -/* a dummy destruct callback for the callers that assume AVPacket.destruct == - * NULL => static data */ -static void dummy_destruct_packet(AVPacket *pkt) -{ - av_assert0(0); -} -#endif - void av_init_packet(AVPacket *pkt) { pkt->pts = AV_NOPTS_VALUE; @@ -55,11 +39,6 @@ void av_init_packet(AVPacket *pkt) pkt->convergence_duration = 0; pkt->flags = 0; pkt->stream_index = 0; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->buf = NULL; pkt->side_data = NULL; pkt->side_data_elems = 0; @@ -91,11 +70,6 @@ int av_new_packet(AVPacket *pkt, int size) pkt->buf = buf; pkt->data = buf->data; pkt->size = size; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dummy_destruct_packet; -FF_ENABLE_DEPRECATION_WARNINGS -#endif return 0; } @@ -128,11 +102,6 @@ int av_grow_packet(AVPacket *pkt, int grow_by) if (!pkt->buf) return AVERROR(ENOMEM); memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by)); -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dummy_destruct_packet; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } pkt->data = pkt->buf->data; pkt->size += grow_by; @@ -153,11 +122,6 @@ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size) pkt->data = data; pkt->size = size; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dummy_destruct_packet; -FF_ENABLE_DEPRECATION_WARNINGS -#endif return 0; } @@ -203,11 +167,6 @@ static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) } else { DUP_DATA(pkt->data, src->data, pkt->size, 1, ALLOC_BUF); } -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dummy_destruct_packet; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (pkt->side_data_elems && dup) pkt->side_data = src->side_data; if (pkt->side_data_elems && !dup) { @@ -280,15 +239,8 @@ void av_packet_free_side_data(AVPacket *pkt) void av_free_packet(AVPacket *pkt) { if (pkt) { -FF_DISABLE_DEPRECATION_WARNINGS if (pkt->buf) av_buffer_unref(&pkt->buf); -#if FF_API_DESTRUCT_PACKET - else if (pkt->destruct) - pkt->destruct(pkt); - pkt->destruct = NULL; -#endif -FF_ENABLE_DEPRECATION_WARNINGS pkt->data = NULL; pkt->size = 0; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f51070c5bc..729df1187e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1807,11 +1807,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avpkt->data) { AVBufferRef *buf = avpkt->buf; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - void *destruct = avpkt->destruct; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avpkt->size < size) { av_log(avctx, AV_LOG_ERROR, "User packet is too small (%d < %"PRId64")\n", avpkt->size, size); @@ -1819,11 +1814,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } av_init_packet(avpkt); -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - avpkt->destruct = destruct; -FF_ENABLE_DEPRECATION_WARNINGS -#endif avpkt->buf = buf; avpkt->size = size; return 0; diff --git a/libavcodec/version.h b/libavcodec/version.h index 00347c958e..7a1c633204 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -76,9 +76,6 @@ #ifndef FF_API_DEINTERLACE #define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 57) #endif -#ifndef FF_API_DESTRUCT_PACKET -#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 57) -#endif #ifndef FF_API_GET_BUFFER #define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 57) #endif |