diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:50:09 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:50:09 +0300 |
| commit | 87c88122703f2befcf96383d05bdf14373c22df9 (patch) | |
| tree | 440194d29f606b9926ad57b9a15d0709ee12ccd7 /libavcodec/utils.c | |
| 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/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 10 |
1 files changed, 0 insertions, 10 deletions
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; |