diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-07-05 14:31:29 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-07-11 00:36:41 +0200 |
| commit | 459dc81a64a3c3fe99d45570a23b897172efc739 (patch) | |
| tree | 0ac6a6e0b1648ffe2dbe0bd27c74e76d5941adaa /libavformat | |
| parent | 19ea08a11a8ea31797b509bf66a06c2f9e463d60 (diff) | |
| download | ffmpeg-459dc81a64a3c3fe99d45570a23b897172efc739.tar.gz | |
lavf/segment: reindent after last commit
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/segment.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index 756161fd96..209d87b3e5 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -696,24 +696,23 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) seg->is_first_pkt = 0; } - /* todo: reindent */ - av_log(s, AV_LOG_DEBUG, "stream:%d start_pts_time:%s pts:%s pts_time:%s dts:%s dts_time:%s", - pkt->stream_index, - av_ts2timestr(seg->cur_entry.start_pts, &AV_TIME_BASE_Q), - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); - - /* compute new timestamps */ - offset = av_rescale_q(seg->initial_offset - (seg->reset_timestamps ? seg->cur_entry.start_pts : 0), - AV_TIME_BASE_Q, st->time_base); - if (pkt->pts != AV_NOPTS_VALUE) - pkt->pts += offset; - if (pkt->dts != AV_NOPTS_VALUE) - pkt->dts += offset; - - av_log(s, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n", - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); + av_log(s, AV_LOG_DEBUG, "stream:%d start_pts_time:%s pts:%s pts_time:%s dts:%s dts_time:%s", + pkt->stream_index, + av_ts2timestr(seg->cur_entry.start_pts, &AV_TIME_BASE_Q), + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); + + /* compute new timestamps */ + offset = av_rescale_q(seg->initial_offset - (seg->reset_timestamps ? seg->cur_entry.start_pts : 0), + AV_TIME_BASE_Q, st->time_base); + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts += offset; + if (pkt->dts != AV_NOPTS_VALUE) + pkt->dts += offset; + + av_log(s, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n", + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); ret = ff_write_chained(oc, pkt->stream_index, pkt, s); |