[FFmpeg-cvslog] Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 15:51:11 2017 -0300| [a295fee28496296a711715e4f5c93e4ad3168a71] | committer: James Almer

Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'

* commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a':
  lavf: Drop deprecated AVFract type and related field

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

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

 libavformat/avformat.h | 21 ---------------------
 libavformat/version.h  |  3 ---
 2 files changed, 24 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b0de66ac14..870409061f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -437,19 +437,6 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
  */
 int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
 
-#if FF_API_LAVF_FRAC
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-#endif
-
 /*************************************************/
 /* input/output formats */
 
@@ -894,14 +881,6 @@ typedef struct AVStream {
 #endif
     void *priv_data;
 
-#if FF_API_LAVF_FRAC
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated
-    struct AVFrac pts;
-#endif
-
     /**
      * This is the fundamental unit of time (in seconds) in terms
      * of which frame timestamps are represented.
diff --git a/libavformat/version.h b/libavformat/version.h
index 262cd35fe0..64b6a3827b 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -55,9 +55,6 @@
  * at once through the bump. This improves the git bisect-ability of the change.
  *
  */
-#ifndef FF_API_LAVF_FRAC
-#define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LAVF_CODEC_TB
 #define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 58)
 #endif


======================================================================

diff --cc libavformat/version.h
index 262cd35fe0,dad38d1180..64b6a3827b
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@@ -49,15 -47,7 +49,12 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the change.
 + *
   */
- #ifndef FF_API_LAVF_FRAC
- #define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
- #endif
  #ifndef FF_API_LAVF_CODEC_TB
  #define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 58)
  #endif