History

lavc: Drop deprecated destruct_packet related functions

Deprecated in 10/2012.

Vittorio Giovara committed 11 years ago

Commit 01bcc2d1 parent dc70c1912 files · +2 −144Browse files

Unified · Split

12 files
  1. libavcodec/avcodec.h +1 −15
  2. libavcodec/avpacket.c +1 −55
  3. libavcodec/utils.c +0 −10
  4. libavcodec/version.h +0 −3
  5. libavdevice/v4l2.c +0 −12
  6. libavformat/avidec.c +0 −13
  7. libavformat/mux.c +0 −5
  8. libavformat/mxg.c +0 −10
  9. libavformat/psxstr.c +0 −5
  10. libavformat/rmdec.c +0 −5
  11. libavformat/utils.c +0 −6
  12. libavformat/yop.c +0 −5
libavcodec/avcodec.h+1−15
@@ -1209,12 +1209,7 @@ typedef struct AVPacket { · 1208 unmodified lines
12091209 * Equals next_pts - this_pts in presentation order.
12101210 */
12111211 int duration;
1212−#if FF_API_DESTRUCT_PACKET
1213− attribute_deprecated
1214− void (*destruct)(struct AVPacket *);
1215− attribute_deprecated
1216− void *priv;
1217−#endif
1212+
12181213 int64_t pos; ///< byte position in stream, -1 if unknown
12191214
12201215 /**
@@ -3576,15 +3571,6 @@ void avsubtitle_free(AVSubtitle *sub); · 2355 unmodified lines
35763571 * @{
35773572 */
35783573
3579−#if FF_API_DESTRUCT_PACKET
3580−/**
3581− * Default packet destructor.
3582− * @deprecated use the AVBuffer API instead
3583− */
3584−attribute_deprecated
3585−void av_destruct_packet(AVPacket *pkt);
3586−#endif
3587−
35883574 /**
35893575 * Initialize optional fields of a packet with default values.
35903576 *
libavcodec/avpacket.c+1−55
@@ -27,22 +27,6 @@ · 26 unmodified lines
2727 #include "libavutil/mathematics.h"
2828 #include "libavutil/mem.h"
2929 #include "avcodec.h"
30−#if FF_API_DESTRUCT_PACKET
31−
32−void av_destruct_packet(AVPacket *pkt)
33−{
34− av_free(pkt->data);
35− pkt->data = NULL;
36− pkt->size = 0;
37−}
38−
39−/* a dummy destruct callback for the callers that assume AVPacket.destruct ==
40− * NULL => static data */
41−static void dummy_destruct_packet(AVPacket *pkt)
42−{
43− av_assert0(0);
44−}
45−#endif
4630
4731 void av_init_packet(AVPacket *pkt)
4832 {
@@ -53,11 +37,6 @@ void av_init_packet(AVPacket *pkt) · 4 unmodified lines
5337 pkt->convergence_duration = 0;
5438 pkt->flags = 0;
5539 pkt->stream_index = 0;
56−#if FF_API_DESTRUCT_PACKET
57−FF_DISABLE_DEPRECATION_WARNINGS
58− pkt->destruct = NULL;
59−FF_ENABLE_DEPRECATION_WARNINGS
60−#endif
6140 pkt->buf = NULL;
6241 pkt->side_data = NULL;
6342 pkt->side_data_elems = 0;
@@ -89,11 +68,6 @@ int av_new_packet(AVPacket *pkt, int size) · 25 unmodified lines
8968 pkt->buf = buf;
9069 pkt->data = buf->data;
9170 pkt->size = size;
92−#if FF_API_DESTRUCT_PACKET
93−FF_DISABLE_DEPRECATION_WARNINGS
94− pkt->destruct = dummy_destruct_packet;
95−FF_ENABLE_DEPRECATION_WARNINGS
96−#endif
9771
9872 return 0;
9973 }
@@ -126,11 +100,6 @@ int av_grow_packet(AVPacket *pkt, int grow_by) · 26 unmodified lines
126100 if (!pkt->buf)
127101 return AVERROR(ENOMEM);
128102 memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by));
129−#if FF_API_DESTRUCT_PACKET
130−FF_DISABLE_DEPRECATION_WARNINGS
131− pkt->destruct = dummy_destruct_packet;
132−FF_ENABLE_DEPRECATION_WARNINGS
133−#endif
134103 }
135104 pkt->data = pkt->buf->data;
136105 pkt->size += grow_by;
@@ -151,11 +120,6 @@ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size) · 14 unmodified lines
151120
152121 pkt->data = data;
153122 pkt->size = size;
154−#if FF_API_DESTRUCT_PACKET
155−FF_DISABLE_DEPRECATION_WARNINGS
156− pkt->destruct = dummy_destruct_packet;
157−FF_ENABLE_DEPRECATION_WARNINGS
158−#endif
159123
160124 return 0;
161125 }
@@ -191,23 +155,12 @@ int av_dup_packet(AVPacket *pkt) · 29 unmodified lines
191155 {
192156 AVPacket tmp_pkt;
193157
194−FF_DISABLE_DEPRECATION_WARNINGS
195− if (!pkt->buf && pkt->data
196−#if FF_API_DESTRUCT_PACKET
197− && !pkt->destruct
198−#endif
199− ) {
200−FF_ENABLE_DEPRECATION_WARNINGS
158+ if (!pkt->buf && pkt->data) {
201159 tmp_pkt = *pkt;
202160
203161 pkt->data = NULL;
204162 pkt->side_data = NULL;
205163 DUP_DATA(pkt->data, tmp_pkt.data, pkt->size, 1, ALLOC_BUF);
206−#if FF_API_DESTRUCT_PACKET
207−FF_DISABLE_DEPRECATION_WARNINGS
208− pkt->destruct = dummy_destruct_packet;
209−FF_ENABLE_DEPRECATION_WARNINGS
210−#endif
211164
212165 if (pkt->side_data_elems) {
213166 int i;
@@ -243,15 +196,8 @@ void av_packet_free_side_data(AVPacket *pkt) · 29 unmodified lines
243196 void av_free_packet(AVPacket *pkt)
244197 {
245198 if (pkt) {
246−FF_DISABLE_DEPRECATION_WARNINGS
247199 if (pkt->buf)
248200 av_buffer_unref(&pkt->buf);
249−#if FF_API_DESTRUCT_PACKET
250− else if (pkt->destruct)
251− pkt->destruct(pkt);
252− pkt->destruct = NULL;
253−#endif
254−FF_ENABLE_DEPRECATION_WARNINGS
255201 pkt->data = NULL;
256202 pkt->size = 0;
257203
libavcodec/utils.c+0−10
@@ -1329,21 +1329,11 @@ int ff_alloc_packet(AVPacket *avpkt, int size) · 1328 unmodified lines
13291329
13301330 if (avpkt->data) {
13311331 AVBufferRef *buf = avpkt->buf;
1332−#if FF_API_DESTRUCT_PACKET
1333−FF_DISABLE_DEPRECATION_WARNINGS
1334− void *destruct = avpkt->destruct;
1335−FF_ENABLE_DEPRECATION_WARNINGS
1336−#endif
13371332
13381333 if (avpkt->size < size)
13391334 return AVERROR(EINVAL);
13401335
13411336 av_init_packet(avpkt);
1342−#if FF_API_DESTRUCT_PACKET
1343−FF_DISABLE_DEPRECATION_WARNINGS
1344− avpkt->destruct = destruct;
1345−FF_ENABLE_DEPRECATION_WARNINGS
1346−#endif
13471337 avpkt->buf = buf;
13481338 avpkt->size = size;
13491339 return 0;
libavcodec/version.h+0−3
@@ -51,9 +51,6 @@ · 50 unmodified lines
5151 #ifndef FF_API_DEINTERLACE
5252 #define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 57)
5353 #endif
54−#ifndef FF_API_DESTRUCT_PACKET
55−#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 57)
56−#endif
5754 #ifndef FF_API_GET_BUFFER
5855 #define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 57)
5956 #endif
libavdevice/v4l2.c+0−12
@@ -421,13 +421,6 @@ static int mmap_init(AVFormatContext *ctx) · 420 unmodified lines
421421 return 0;
422422 }
423423
424−#if FF_API_DESTRUCT_PACKET
425−static void dummy_release_buffer(AVPacket *pkt)
426−{
427− av_assert0(0);
428−}
429−#endif
430−
431424 static void mmap_release_buffer(void *opaque, uint8_t *data)
432425 {
433426 struct v4l2_buffer buf = { 0 };
@@ -524,11 +517,6 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) · 90 unmodified lines
524517
525518 pkt->data = s->buf_start[buf.index];
526519 pkt->size = buf.bytesused;
527−#if FF_API_DESTRUCT_PACKET
528−FF_DISABLE_DEPRECATION_WARNINGS
529− pkt->destruct = dummy_release_buffer;
530−FF_ENABLE_DEPRECATION_WARNINGS
531−#endif
532520
533521 buf_descriptor = av_malloc(sizeof(struct buff_data));
534522 if (!buf_descriptor) {
libavformat/avidec.c+0−13
@@ -1095,9 +1095,6 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) · 1094 unmodified lines
10951095 AVIContext *avi = s->priv_data;
10961096 AVIOContext *pb = s->pb;
10971097 int err;
1098−#if FF_API_DESTRUCT_PACKET
1099− void *dstr;
1100−#endif
11011098
11021099 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
11031100 int size = avpriv_dv_get_packet(avi->dv_demux, pkt);
@@ -1213,18 +1210,8 @@ resync: · 109 unmodified lines
12131210
12141211 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
12151212 AVBufferRef *avbuf = pkt->buf;
1216−#if FF_API_DESTRUCT_PACKET
1217−FF_DISABLE_DEPRECATION_WARNINGS
1218− dstr = pkt->destruct;
1219−FF_ENABLE_DEPRECATION_WARNINGS
1220−#endif
12211213 size = avpriv_dv_produce_packet(avi->dv_demux, pkt,
12221214 pkt->data, pkt->size);
1223−#if FF_API_DESTRUCT_PACKET
1224−FF_DISABLE_DEPRECATION_WARNINGS
1225− pkt->destruct = dstr;
1226−FF_ENABLE_DEPRECATION_WARNINGS
1227−#endif
12281215 pkt->buf = avbuf;
12291216 pkt->flags |= AV_PKT_FLAG_KEY;
12301217 if (size < 0)
libavformat/mux.c+0−5
@@ -413,11 +413,6 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, · 412 unmodified lines
413413 if (!this_pktl)
414414 return AVERROR(ENOMEM);
415415 this_pktl->pkt = *pkt;
416−#if FF_API_DESTRUCT_PACKET
417−FF_DISABLE_DEPRECATION_WARNINGS
418− pkt->destruct = NULL; // do not free original but only the copy
419−FF_ENABLE_DEPRECATION_WARNINGS
420−#endif
421416 pkt->buf = NULL;
422417 pkt->side_data = NULL;
423418 pkt->side_data_elems = 0;
libavformat/mxg.c+0−10
@@ -169,11 +169,6 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt) · 168 unmodified lines
169169
170170 pkt->pts = pkt->dts = mxg->dts;
171171 pkt->stream_index = 0;
172−#if FF_API_DESTRUCT_PACKET
173−FF_DISABLE_DEPRECATION_WARNINGS
174− pkt->destruct = NULL;
175−FF_ENABLE_DEPRECATION_WARNINGS
176−#endif
177172 pkt->buf = NULL;
178173 pkt->size = mxg->buffer_ptr - mxg->soi_ptr;
179174 pkt->data = mxg->soi_ptr;
@@ -212,11 +207,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 32 unmodified lines
212207 /* time (GMT) of first sample in usec since 1970, little-endian */
213208 pkt->pts = pkt->dts = AV_RL64(startmarker_ptr + 8);
214209 pkt->stream_index = 1;
215−#if FF_API_DESTRUCT_PACKET
216−FF_DISABLE_DEPRECATION_WARNINGS
217− pkt->destruct = NULL;
218−FF_ENABLE_DEPRECATION_WARNINGS
219−#endif
220210 pkt->buf = NULL;
221211 pkt->size = size - 14;
222212 pkt->data = startmarker_ptr + 16;
libavformat/psxstr.c+0−5
@@ -203,11 +203,6 @@ static int str_read_packet(AVFormatContext *s, · 202 unmodified lines
203203 pkt->data= NULL;
204204 pkt->size= -1;
205205 pkt->buf = NULL;
206−#if FF_API_DESTRUCT_PACKET
207−FF_DISABLE_DEPRECATION_WARNINGS
208− pkt->destruct = NULL;
209−FF_ENABLE_DEPRECATION_WARNINGS
210−#endif
211206 return 0;
212207 }
213208
libavformat/rmdec.c+0−5
@@ -687,11 +687,6 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb, · 686 unmodified lines
687687 vst->pkt.data= NULL;
688688 vst->pkt.size= 0;
689689 vst->pkt.buf = NULL;
690−#if FF_API_DESTRUCT_PACKET
691−FF_DISABLE_DEPRECATION_WARNINGS
692− vst->pkt.destruct = NULL;
693−FF_ENABLE_DEPRECATION_WARNINGS
694−#endif
695690 if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
696691 memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
697692 vst->videobufpos - 1 - 8*vst->slices);
libavformat/utils.c+0−6
@@ -828,12 +828,6 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index) · 827 unmodified lines
828828 if (out_pkt.data == pkt->data && out_pkt.size == pkt->size) {
829829 out_pkt.buf = pkt->buf;
830830 pkt->buf = NULL;
831−#if FF_API_DESTRUCT_PACKET
832−FF_DISABLE_DEPRECATION_WARNINGS
833− out_pkt.destruct = pkt->destruct;
834− pkt->destruct = NULL;
835−FF_ENABLE_DEPRECATION_WARNINGS
836−#endif
837831 }
838832 if ((ret = av_dup_packet(&out_pkt)) < 0)
839833 goto fail;
libavformat/yop.c+0−5
@@ -127,11 +127,6 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt) · 126 unmodified lines
127127 *pkt = yop->video_packet;
128128 yop->video_packet.data = NULL;
129129 yop->video_packet.buf = NULL;
130−#if FF_API_DESTRUCT_PACKET
131−FF_DISABLE_DEPRECATION_WARNINGS
132− yop->video_packet.destruct = NULL;
133−FF_ENABLE_DEPRECATION_WARNINGS
134−#endif
135130 yop->video_packet.size = 0;
136131 pkt->data[0] = yop->odd_frame;
137132 pkt->flags |= AV_PKT_FLAG_KEY;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t