diff options
author | James Almer <jamrial@gmail.com> | 2017-10-22 06:30:12 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-22 06:30:12 +0300 |
commit | 417d473bde220a1f267bc694835c129a5adc4309 (patch) | |
tree | 9ea1a2bb1e39c3eeee3d742aea05d2d0fdbaa0ea /libavcodec/avpacket.c | |
parent | 90000f15ec41fbb768b6b3d360131638d089bd59 (diff) |
avcodec: remove ABI portion of the side data merging API
The actual API is left in place until the deprecation period ends.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/avpacket.c')
-rw-r--r-- | libavcodec/avpacket.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index d1f4ea9eb3..90b8215928 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -479,34 +479,6 @@ int av_packet_split_side_data(AVPacket *pkt){ } #endif -#if FF_API_MERGE_SD -int ff_packet_split_and_drop_side_data(AVPacket *pkt){ - if (!pkt->side_data_elems && pkt->size >12 && AV_RB64(pkt->data + pkt->size - 8) == FF_MERGE_MARKER){ - int i; - unsigned int size; - uint8_t *p; - - p = pkt->data + pkt->size - 8 - 5; - for (i=1; ; i++){ - size = AV_RB32(p); - if (size>INT_MAX - 5 || p - pkt->data < size) - return 0; - if (p[4]&128) - break; - if (p - pkt->data < size + 5) - return 0; - p-= size+5; - if (i > AV_PKT_DATA_NB) - return 0; - } - pkt->size = p - pkt->data - size; - av_assert0(pkt->size >= 0); - return 1; - } - return 0; -} -#endif - uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) { AVDictionaryEntry *t = NULL; |