[FFmpeg-cvslog] lavc: Drop deprecated destruct_packet related functions
Vittorio Giovara
git at videolan.org
Sat Sep 5 16:52:57 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Jul 28 14:30:23 2015 +0100| [01bcc2d5c23fa757d163530abb396fd02f1be7c8] | committer: Vittorio Giovara
lavc: Drop deprecated destruct_packet related functions
Deprecated in 10/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01bcc2d5c23fa757d163530abb396fd02f1be7c8
---
libavcodec/avcodec.h | 16 +-------------
libavcodec/avpacket.c | 56 +------------------------------------------------
libavcodec/utils.c | 10 ---------
libavcodec/version.h | 3 ---
libavdevice/v4l2.c | 12 -----------
libavformat/avidec.c | 13 ------------
libavformat/mux.c | 5 -----
libavformat/mxg.c | 10 ---------
libavformat/psxstr.c | 5 -----
libavformat/rmdec.c | 5 -----
libavformat/utils.c | 6 ------
libavformat/yop.c | 5 -----
12 files changed, 2 insertions(+), 144 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e9aba6a..1d18c36 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1209,12 +1209,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
/**
@@ -3576,15 +3571,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 bad379f..dfaf045 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -27,22 +27,6 @@
#include "libavutil/mathematics.h"
#include "libavutil/mem.h"
#include "avcodec.h"
-#if FF_API_DESTRUCT_PACKET
-
-void av_destruct_packet(AVPacket *pkt)
-{
- av_free(pkt->data);
- pkt->data = NULL;
- 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)
{
@@ -53,11 +37,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;
@@ -89,11 +68,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;
}
@@ -126,11 +100,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;
@@ -151,11 +120,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;
}
@@ -191,23 +155,12 @@ int av_dup_packet(AVPacket *pkt)
{
AVPacket tmp_pkt;
-FF_DISABLE_DEPRECATION_WARNINGS
- if (!pkt->buf && pkt->data
-#if FF_API_DESTRUCT_PACKET
- && !pkt->destruct
-#endif
- ) {
-FF_ENABLE_DEPRECATION_WARNINGS
+ if (!pkt->buf && pkt->data) {
tmp_pkt = *pkt;
pkt->data = NULL;
pkt->side_data = NULL;
DUP_DATA(pkt->data, tmp_pkt.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) {
int i;
@@ -243,15 +196,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 2f0997a..6779e1a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1329,21 +1329,11 @@ int ff_alloc_packet(AVPacket *avpkt, int size)
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)
return AVERROR(EINVAL);
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 0fbb836..14a354d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -51,9 +51,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
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index a2b49c6..7b35682 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -421,13 +421,6 @@ static int mmap_init(AVFormatContext *ctx)
return 0;
}
-#if FF_API_DESTRUCT_PACKET
-static void dummy_release_buffer(AVPacket *pkt)
-{
- av_assert0(0);
-}
-#endif
-
static void mmap_release_buffer(void *opaque, uint8_t *data)
{
struct v4l2_buffer buf = { 0 };
@@ -524,11 +517,6 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
pkt->data = s->buf_start[buf.index];
pkt->size = buf.bytesused;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- pkt->destruct = dummy_release_buffer;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
buf_descriptor = av_malloc(sizeof(struct buff_data));
if (!buf_descriptor) {
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 564318e..63afe2f 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1095,9 +1095,6 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
AVIContext *avi = s->priv_data;
AVIOContext *pb = s->pb;
int err;
-#if FF_API_DESTRUCT_PACKET
- void *dstr;
-#endif
if (CONFIG_DV_DEMUXER && avi->dv_demux) {
int size = avpriv_dv_get_packet(avi->dv_demux, pkt);
@@ -1213,18 +1210,8 @@ resync:
if (CONFIG_DV_DEMUXER && avi->dv_demux) {
AVBufferRef *avbuf = pkt->buf;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- dstr = pkt->destruct;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
size = avpriv_dv_produce_packet(avi->dv_demux, pkt,
pkt->data, pkt->size);
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- pkt->destruct = dstr;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->buf = avbuf;
pkt->flags |= AV_PKT_FLAG_KEY;
if (size < 0)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 3cff264..7959edf 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -413,11 +413,6 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
if (!this_pktl)
return AVERROR(ENOMEM);
this_pktl->pkt = *pkt;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- pkt->destruct = NULL; // do not free original but only the copy
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->buf = NULL;
pkt->side_data = NULL;
pkt->side_data_elems = 0;
diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index 3cde2de..396dbde 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -169,11 +169,6 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pts = pkt->dts = mxg->dts;
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->size = mxg->buffer_ptr - mxg->soi_ptr;
pkt->data = mxg->soi_ptr;
@@ -212,11 +207,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
/* time (GMT) of first sample in usec since 1970, little-endian */
pkt->pts = pkt->dts = AV_RL64(startmarker_ptr + 8);
pkt->stream_index = 1;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- pkt->destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->buf = NULL;
pkt->size = size - 14;
pkt->data = startmarker_ptr + 16;
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index e662ed7..573ef0a 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -203,11 +203,6 @@ static int str_read_packet(AVFormatContext *s,
pkt->data= NULL;
pkt->size= -1;
pkt->buf = NULL;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- pkt->destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
return 0;
}
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index d28a2a8..54ffc15 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -687,11 +687,6 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
vst->pkt.data= NULL;
vst->pkt.size= 0;
vst->pkt.buf = NULL;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- vst->pkt.destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
vst->videobufpos - 1 - 8*vst->slices);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d72f533..5d4ec62 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -828,12 +828,6 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index)
if (out_pkt.data == pkt->data && out_pkt.size == pkt->size) {
out_pkt.buf = pkt->buf;
pkt->buf = NULL;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- out_pkt.destruct = pkt->destruct;
- pkt->destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
if ((ret = av_dup_packet(&out_pkt)) < 0)
goto fail;
diff --git a/libavformat/yop.c b/libavformat/yop.c
index b809ad2..1e429d3 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -127,11 +127,6 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
*pkt = yop->video_packet;
yop->video_packet.data = NULL;
yop->video_packet.buf = NULL;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
- yop->video_packet.destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
yop->video_packet.size = 0;
pkt->data[0] = yop->odd_frame;
pkt->flags |= AV_PKT_FLAG_KEY;
More information about the ffmpeg-cvslog
mailing list