diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:43 +0100 |
| commit | c5254755c0154dcc7bb1191a84e6e7cf0106343b (patch) | |
| tree | 3223822b526284c38bdfea51e97d96633169a74f /libavformat | |
| parent | 374e469b8dcef1c3d9a7769fad178cbed210da73 (diff) | |
| download | ffmpeg-c5254755c0154dcc7bb1191a84e6e7cf0106343b.tar.gz | |
lavf: remove disabled FF_API_SET_PTS_INFO cruft
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 26d008d03d..a78c1e3b72 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1268,15 +1268,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 0f910691b9..41450971af 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3579,14 +3579,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 4a6f74bc98..6f3b387ddc 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ * Those FF_API_* defines are not part of public API. * They may change, break or disappear at any time. */ -#ifndef FF_API_SET_PTS_INFO -#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_CLOSE_INPUT_FILE #define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 55) #endif |