MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf/segment: add function set_segment_filename()

Browse Source 
Factorize.
This commit is contained in:
Stefano Sabatini 2012-12-13 11:37:50 +01:00
parent 616e6ffac6
commit d93d03a492
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/segment.c
View File

@ -130,6 +130,21 @@ static int segment_mux_init(AVFormatContext *s)
return 0;
}
static int set_segment_filename(AVFormatContext *s)
{
SegmentContext *seg = s->priv_data;
AVFormatContext *oc = seg->avf;
if (seg->segment_idx_wrap)
seg->segment_idx %= seg->segment_idx_wrap;
if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
s->filename, seg->segment_idx) < 0) {
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", s->filename);
return AVERROR(EINVAL);
}
return 0;
}
static int segment_start(AVFormatContext *s, int write_header)
{
SegmentContext *seg = s->priv_data;
@ -145,14 +160,8 @@ static int segment_start(AVFormatContext *s, int write_header)
}
seg->segment_idx++;
if (seg->segment_idx_wrap)
seg->segment_idx %= seg->segment_idx_wrap;
if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
s->filename, seg->segment_idx) < 0) {
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", s->filename);
return AVERROR(EINVAL);
}
if ((err = set_segment_filename(s)) < 0)
return err;
seg->segment_count++;
if ((err = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
@ -413,11 +422,8 @@ static int seg_write_header(AVFormatContext *s)
goto fail;
oc = seg->avf;
if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
s->filename, seg->segment_idx) < 0) {
ret = AVERROR(EINVAL);
if ((ret = set_segment_filename(s)) < 0)
goto fail;
}
seg->segment_count++;
if (seg->write_header_trailer) {