diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:26:13 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-10-05 17:10:20 -0300 |
| commit | 3bd9f17b8af9604eb2fb47cad2c40f580417ceb1 (patch) | |
| tree | 53ee1dc3197d008b6cfc5020d0351557dc5ae1f2 /libavformat | |
| parent | a578b93c73a1f00d857664edea5bd84be6a7674b (diff) | |
| download | ffmpeg-3bd9f17b8af9604eb2fb47cad2c40f580417ceb1.tar.gz | |
avformat: remove obsolete FF_API_SET_PTS_INFO cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 9 | ||||
| -rw-r--r-- | libavformat/utils.c | 8 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 20 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 126765f1ae..e3c22d44a2 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2175,15 +2175,6 @@ void avformat_close_input(AVFormatContext **s); * @} */ -#if FF_API_SET_PTS_INFO -/** - * @deprecated this function is not supposed to be called outside of lavf - */ -attribute_deprecated -void av_set_pts_info(AVStream *s, int pts_wrap_bits, - unsigned int pts_num, unsigned int pts_den); -#endif - #define AVSEEK_FLAG_BACKWARD 1 ///< seek backward #define AVSEEK_FLAG_BYTE 2 ///< seeking based on position in bytes #define AVSEEK_FLAG_ANY 4 ///< seek to any frame, even non-keyframes diff --git a/libavformat/utils.c b/libavformat/utils.c index 35b387d3ad..888d58ed66 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3906,14 +3906,6 @@ int ff_hex_to_data(uint8_t *data, const char *p) return len; } -#if FF_API_SET_PTS_INFO -void av_set_pts_info(AVStream *s, int pts_wrap_bits, - unsigned int pts_num, unsigned int pts_den) -{ - avpriv_set_pts_info(s, pts_wrap_bits, pts_num, pts_den); -} -#endif - void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits, unsigned int pts_num, unsigned int pts_den) { diff --git a/libavformat/version.h b/libavformat/version.h index 248ee0bc34..38433ee9d7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -61,9 +61,6 @@ #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) #endif -#ifndef FF_API_SET_PTS_INFO -#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56) -#endif #ifndef FF_API_CLOSE_INPUT_FILE #define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56) #endif |