diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:38:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:38:10 +0200 |
| commit | 999a99c865cc12cc69240029b8a280b5ba170b52 (patch) | |
| tree | 76716c81c74a7cac82b4a265b4f6c18b4ce2191f /libavformat/avformat.h | |
| parent | e3c1d9a56c715223284d5bfbcad5cd1f78a798f9 (diff) | |
| parent | a312f71090ee620ee252f2034aef6b13e2dafe9c (diff) | |
| download | ffmpeg-999a99c865cc12cc69240029b8a280b5ba170b52.tar.gz | |
Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'
* commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c':
lavf: deprecate now unused AVStream.pts
Conflicts:
libavformat/mux.c
libavformat/version.h
mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 358ce00f4b..09870d1d35 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -368,6 +368,7 @@ 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 */ @@ -378,6 +379,7 @@ int av_append_packet(AVIOContext *s, AVPacket *pkt, int size); typedef struct AVFrac { int64_t val, num, den; } AVFrac; +#endif /*************************************************/ /* input/output formats */ @@ -785,10 +787,13 @@ typedef struct AVStream { AVCodecContext *codec; void *priv_data; +#if FF_API_LAVF_FRAC /** - * encoding: pts generation when outputting stream + * @deprecated this field is unused */ + attribute_deprecated struct AVFrac pts; +#endif /** * This is the fundamental unit of time (in seconds) in terms |