diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:51:53 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:51:53 +0200 |
| commit | 83a5df54eae6dddea7c453fd25c45c7b9c148925 (patch) | |
| tree | dd2055e828b1c4dce1b80b0f077c4a658e7700f7 /libavcodec/avpacket.c | |
| parent | 87c88122703f2befcf96383d05bdf14373c22df9 (diff) | |
Remove left-over FF_API_DESTRUCT_PACKET cruft
Diffstat (limited to 'libavcodec/avpacket.c')
| -rw-r--r-- | libavcodec/avpacket.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 7b2df14a37..32fa51f24f 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -208,13 +208,7 @@ 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; return copy_packet_data(pkt, &tmp_pkt, 1); } @@ -330,11 +324,6 @@ int av_packet_merge_side_data(AVPacket *pkt){ return AVERROR(ENOMEM); pkt->buf = buf; pkt->data = p = buf->data; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dummy_destruct_packet; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->size = size - AV_INPUT_BUFFER_PADDING_SIZE; bytestream_put_buffer(&p, old.data, old.size); for (i=old.side_data_elems-1; i>=0; i--) { |