Browse code

Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'

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

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

James Almer authored on 2017/10/22 03:51:11
Showing 2 changed files
... ...
@@ -437,19 +437,6 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
437 437
  */
438 438
 int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
439 439
 
440
-#if FF_API_LAVF_FRAC
441
-/*************************************************/
442
-/* fractional numbers for exact pts handling */
443
-
444
-/**
445
- * The exact value of the fractional number is: 'val + num / den'.
446
- * num is assumed to be 0 <= num < den.
447
- */
448
-typedef struct AVFrac {
449
-    int64_t val, num, den;
450
-} AVFrac;
451
-#endif
452
-
453 440
 /*************************************************/
454 441
 /* input/output formats */
455 442
 
... ...
@@ -894,14 +881,6 @@ typedef struct AVStream {
894 894
 #endif
895 895
     void *priv_data;
896 896
 
897
-#if FF_API_LAVF_FRAC
898
-    /**
899
-     * @deprecated this field is unused
900
-     */
901
-    attribute_deprecated
902
-    struct AVFrac pts;
903
-#endif
904
-
905 897
     /**
906 898
      * This is the fundamental unit of time (in seconds) in terms
907 899
      * of which frame timestamps are represented.
... ...
@@ -55,9 +55,6 @@
55 55
  * at once through the bump. This improves the git bisect-ability of the change.
56 56
  *
57 57
  */
58
-#ifndef FF_API_LAVF_FRAC
59
-#define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
60
-#endif
61 58
 #ifndef FF_API_LAVF_CODEC_TB
62 59
 #define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 58)
63 60
 #endif