diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-10-09 09:22:36 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2020-10-28 14:55:53 +0100 |
| commit | cb46a6bcbcb85b3910cc0cce78399686ab8efff6 (patch) | |
| tree | 47709e77ce7cd376f91374fe3248d1dc0802b521 /libavformat/mux.c | |
| parent | 323c9a8c523d772d7439cf386749f0243fecfa9a (diff) | |
| download | ffmpeg-cb46a6bcbcb85b3910cc0cce78399686ab8efff6.tar.gz | |
lavf: move AVStream.{nb_decoded_frames,mux_ts_offset} to AVStreamInternal
Those are private fields, no reason to have them exposed in a public
header.
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 44d5e5d1c0..8a2d6370f6 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -678,7 +678,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if (s->avoid_negative_ts > 0) { AVStream *st = s->streams[pkt->stream_index]; - int64_t offset = st->mux_ts_offset; + int64_t offset = st->internal->mux_ts_offset; int64_t ts = s->internal->avoid_negative_ts_use_pts ? pkt->pts : pkt->dts; if (s->internal->offset == AV_NOPTS_VALUE && ts != AV_NOPTS_VALUE && @@ -688,7 +688,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } if (s->internal->offset != AV_NOPTS_VALUE && !offset) { - offset = st->mux_ts_offset = + offset = st->internal->mux_ts_offset = av_rescale_q_rnd(s->internal->offset, s->internal->offset_timebase, st->time_base, @@ -1038,7 +1038,7 @@ int ff_interleaved_peek(AVFormatContext *s, int stream, *pkt = pktl->pkt; if (add_offset) { AVStream *st = s->streams[pkt->stream_index]; - int64_t offset = st->mux_ts_offset; + int64_t offset = st->internal->mux_ts_offset; if (s->output_ts_offset) offset += av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, st->time_base); |