diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:28:56 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:28:56 +0100 |
| commit | 7f5af80ba42bbd82da53dfd95236e9d47159a96a (patch) | |
| tree | f85abbee087fa12065f02278c710ea4830c2cae5 /libavcodec/avpacket.c | |
| parent | 856b19d5935b544e96156f8e75e23b28c0a9f318 (diff) | |
| parent | ce70f28a1732c74a9cd7fec2d56178750bd6e457 (diff) | |
Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
avpacket: Replace av_free_packet with av_packet_unref
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avpacket.c')
| -rw-r--r-- | libavcodec/avpacket.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 0496254cf4..648dc10076 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -204,7 +204,7 @@ int av_copy_packet_side_data(AVPacket *pkt, const AVPacket *src) return 0; failed_alloc: - av_free_packet(pkt); + av_packet_unref(pkt); return AVERROR(ENOMEM); } @@ -234,6 +234,8 @@ void av_packet_free_side_data(AVPacket *pkt) pkt->side_data_elems = 0; } +#if FF_API_AVPACKET_OLD_API +FF_DISABLE_DEPRECATION_WARNINGS void av_free_packet(AVPacket *pkt) { if (pkt) { @@ -245,6 +247,8 @@ void av_free_packet(AVPacket *pkt) av_packet_free_side_data(pkt); } } +FF_ENABLE_DEPRECATION_WARNINGS +#endif uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, int size) |