X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Futils.c;h=8227d1bbe18bbcd1f385d7d7b30152ded8ffc344;hb=d682ae70b4b3a53fb73ec30281f9f4cfbc531edd;hp=37d7024465cb8823b755965dd76f4b9fdbab1405;hpb=5e3a418b6047acd848698c4bb4bf0c1b73526744;p=ffmpeg

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 37d7024465c..8227d1bbe18 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1675,8 +1675,12 @@ FF_ENABLE_DEPRECATION_WARNINGS
             st->inject_global_side_data = 0;
         }
 
+#if FF_API_LAVF_MERGE_SD
+FF_DISABLE_DEPRECATION_WARNINGS
         if (!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA))
             av_packet_merge_side_data(pkt);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
     }
 
     av_opt_get_dict_val(s, "metadata", AV_OPT_SEARCH_CHILDREN, &metadata);