diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 15:51:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:51:11 -0300 |
| commit | a295fee28496296a711715e4f5c93e4ad3168a71 (patch) | |
| tree | dbed49f59417e31d2c1a2b110efe393d8fe09fa8 /libavformat | |
| parent | f02bda3a03c1103a1c293ad030e6bcf089b21902 (diff) | |
| parent | 263358e0c9e7ffaa965fdbe986c8b18381d2b24a (diff) | |
| download | ffmpeg-a295fee28496296a711715e4f5c93e4ad3168a71.tar.gz | |
Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'
* commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a':
lavf: Drop deprecated AVFract type and related field
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 21 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 0 insertions, 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 |