[FFmpeg-cvslog] avformat: remove obsolete FF_API_SET_PTS_INFO cruft

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep 14 21:26:13 2014 -0300| [3bd9f17b8af9604eb2fb47cad2c40f580417ceb1] | committer: James Almer

avformat: remove obsolete FF_API_SET_PTS_INFO cruft

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bd9f17b8af9604eb2fb47cad2c40f580417ceb1
---

 libavformat/avformat.h |    9 ---------
 libavformat/utils.c    |    8 --------
 libavformat/version.h  |    3 ---
 3 files changed, 20 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 126765f..e3c22d4 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 35b387d..888d58e 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 248ee0b..38433ee 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