diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-22 00:30:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-22 00:30:12 -0300 |
| commit | 417d473bde220a1f267bc694835c129a5adc4309 (patch) | |
| tree | 9ea1a2bb1e39c3eeee3d742aea05d2d0fdbaa0ea /libavcodec/internal.h | |
| parent | 90000f15ec41fbb768b6b3d360131638d089bd59 (diff) | |
| download | ffmpeg-417d473bde220a1f267bc694835c129a5adc4309.tar.gz | |
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/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index faa923c11f..f1d520237a 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -373,10 +373,6 @@ int ff_set_sar(AVCodecContext *avctx, AVRational sar); int ff_side_data_update_matrix_encoding(AVFrame *frame, enum AVMatrixEncoding matrix_encoding); -#if FF_API_MERGE_SD -int ff_packet_split_and_drop_side_data(AVPacket *pkt); -#endif - /** * Select the (possibly hardware accelerated) pixel format. * This is a wrapper around AVCodecContext.get_format() and should be used |