X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Favpacket.c;h=8420d8b2581ebe26b3427d8ebeb47452f86932e1;hb=d682ae70b4b3a53fb73ec30281f9f4cfbc531edd;hp=3ea2511dea81631485dd85329555c632ed964cf8;hpb=5e3a418b6047acd848698c4bb4bf0c1b73526744;p=ffmpeg

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 3ea2511dea8..8420d8b2581 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -379,6 +379,8 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
     return NULL;
 }
 
+#if FF_API_MERGE_SD_API
+
 #define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL
 
 int av_packet_merge_side_data(AVPacket *pkt){
@@ -460,6 +462,8 @@ int av_packet_split_side_data(AVPacket *pkt){
     return 0;
 }
 
+#endif
+
 uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size)
 {
     AVDictionaryEntry *t = NULL;