From: softworkz <softwo...@hotmail.com>
Signed-off-by: softworkz <softwo...@hotmail.com>
---
libavformat/segment.c | 48 +++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 3cd9e313f4..8e1e4a9c0c 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -177,7 +177,7 @@ static int segment_mux_init(AVFormatContext *s)
return AVERROR(ENOMEM);
opar = st->codecpar;
if (!oc->oformat->codec_tag ||
- av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) ==
opar->codec_id ||
+ av_codec_get_id(oc->oformat->codec_tag, ipar->codec_tag) ==
opar->codec_id ||
av_codec_get_tag(oc->oformat->codec_tag, ipar->codec_id) <= 0) {
opar->codec_tag = ipar->codec_tag;
} else {
@@ -340,17 +340,17 @@ static void segment_list_print_entry(AVIOContext
*list_ioctx,
list_entry->end_time - list_entry->start_time,
list_entry->filename);
break;
case LIST_TYPE_FFCONCAT:
- {
- char *buf;
- if (av_escape(&buf, list_entry->filename, NULL, AV_ESCAPE_MODE_AUTO,
AV_ESCAPE_FLAG_WHITESPACE) < 0) {
- av_log(log_ctx, AV_LOG_WARNING,
- "Error writing list entry '%s' in list file\n",
list_entry->filename);
- return;
+ {
+ char *buf;
+ if (av_escape(&buf, list_entry->filename, NULL,
AV_ESCAPE_MODE_AUTO, AV_ESCAPE_FLAG_WHITESPACE) < 0) {
+ av_log(log_ctx, AV_LOG_WARNING,
+ "Error writing list entry '%s' in list file\n",
list_entry->filename);
+ return;
+ }
+ avio_printf(list_ioctx, "file %s\n", buf);
+ av_free(buf);
+ break;
}
- avio_printf(list_ioctx, "file %s\n", buf);
- av_free(buf);
- break;
- }
default:
av_assert0(!"Invalid list type");
}
@@ -456,8 +456,8 @@ static int segment_end(AVFormatContext *s, int
write_trailer, int is_last)
av_log(s, AV_LOG_WARNING, "Could not increment stream
%d timecode, error occurred during timecode creation.\n", i);
continue;
}
- st_tc.start += (int)((seg->cur_entry.end_time -
seg->cur_entry.start_time) * av_q2d(st_rate)); // increment timecode
- av_dict_set(&s->streams[i]->metadata, "timecode",
av_timecode_make_string(&st_tc, st_buf, 0), 0);
+ st_tc.start += (int)((seg->cur_entry.end_time -
seg->cur_entry.start_time) * av_q2d(st_rate)); // increment timecode
+ av_dict_set(&s->streams[i]->metadata, "timecode",
av_timecode_make_string(&st_tc, st_buf, 0), 0);
}
}
}
@@ -755,8 +755,8 @@ static int seg_init(AVFormatContext *s)
if (seg->list) {
if (seg->list_type == LIST_TYPE_UNDEFINED) {
- if (av_match_ext(seg->list, "csv" )) seg->list_type =
LIST_TYPE_CSV;
- else if (av_match_ext(seg->list, "ext" )) seg->list_type =
LIST_TYPE_EXT;
+ if (av_match_ext(seg->list, "csv")) seg->list_type =
LIST_TYPE_CSV;
+ else if (av_match_ext(seg->list, "ext")) seg->list_type =
LIST_TYPE_EXT;
else if (av_match_ext(seg->list, "m3u8")) seg->list_type =
LIST_TYPE_M3U8;
else if (av_match_ext(seg->list, "ffcat,ffconcat")) seg->list_type
= LIST_TYPE_FFCONCAT;
else seg->list_type =
LIST_TYPE_FLAT;
@@ -911,11 +911,9 @@ static int seg_write_packet(AVFormatContext *s, AVPacket
*pkt)
calc_times:
if (seg->times) {
- end_pts = seg->segment_count < seg->nb_times ?
- seg->times[seg->segment_count] : INT64_MAX;
+ end_pts = seg->segment_count < seg->nb_times ?
seg->times[seg->segment_count] : INT64_MAX;
} else if (seg->frames) {
- start_frame = seg->segment_count < seg->nb_frames ?
- seg->frames[seg->segment_count] : INT_MAX;
+ start_frame = seg->segment_count < seg->nb_frames ?
seg->frames[seg->segment_count] : INT_MAX;
} else {
if (seg->use_clocktime) {
int64_t avgt = av_gettime();
@@ -956,10 +954,10 @@ calc_times:
(pkt->flags & AV_PKT_FLAG_KEY || seg->break_non_keyframes) &&
(seg->segment_frame_count > 0 || seg->write_empty) &&
(seg->cut_pending || seg->frame_count >= start_frame ||
- (pkt->pts != AV_NOPTS_VALUE &&
- pkt_pts_avtb - seg->cur_entry.start_pts >= seg->min_seg_duration &&
- av_compare_ts(pkt->pts, st->time_base,
- end_pts - seg->time_delta, AV_TIME_BASE_Q) >= 0))) {
+ (pkt->pts != AV_NOPTS_VALUE &&
+ pkt_pts_avtb - seg->cur_entry.start_pts >=
seg->min_seg_duration &&
+ av_compare_ts(pkt->pts, st->time_base,
+ end_pts - seg->time_delta, AV_TIME_BASE_Q) >=
0))) {
/* sanitize end time in case last packet didn't have a defined
duration */
if (seg->cur_entry.last_duration == 0)
seg->cur_entry.end_time = (double)pkt->pts * av_q2d(st->time_base);
@@ -1064,8 +1062,8 @@ static int seg_check_bitstream(AVFormatContext *s,
AVStream *st,
if (ret == 1) {
FFStream *const sti = ffstream(st);
FFStream *const osti = ffstream(ost);
- sti->bsfc = osti->bsfc;
- osti->bsfc = NULL;
+ sti->bsfc = osti->bsfc;
+ osti->bsfc = NULL;
}
return ret;
}
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
