diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-22 01:29:41 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-22 01:29:41 -0300 |
| commit | ca4df37f06f8a47651c67693b4851ed8d7e3ef74 (patch) | |
| tree | 824b50b2b37987f5507cb912c22eb6f2a007a4bb /libavformat/utils.c | |
| parent | 382aaa3312a51d13a5acbdfe0d87391c2a9d2f95 (diff) | |
| download | ffmpeg-ca4df37f06f8a47651c67693b4851ed8d7e3ef74.tar.gz | |
avformat: remove ABI portion of the side data merging API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 1a7996c4fd..d89dd56357 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1677,13 +1677,6 @@ 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); |