diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-17 16:30:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-23 04:16:02 +0200 |
commit | b4d68e7cdb3be029c669b15ac0da158454fb910d (patch) | |
tree | 76e2e056b875efe6c24170b7df76f4de6173acee /libavformat/utils.c | |
parent | 6638e4a950a0208534b1081660fa4549aef61d74 (diff) |
avformat: Remove use of AVFrac and AVStream->pts
Move field to internal part of AVStream and struct to internal.h
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index ccc2129126..758b9400b1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -116,7 +116,10 @@ MAKE_ACCESSORS(AVFormatContext, format, AVOpenCallback, open_cb) int64_t av_stream_get_end_pts(const AVStream *st) { - return st->pts.val; + if (st->priv_pts) { + return st->priv_pts->val; + } else + return AV_NOPTS_VALUE; } struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) @@ -3668,6 +3671,7 @@ void ff_free_stream(AVFormatContext *s, AVStream *st) { av_freep(&st->info->duration_error); av_freep(&st->info); av_freep(&st->recommended_encoder_configuration); + av_freep(&st->priv_pts); av_freep(&s->streams[ --s->nb_streams ]); } |