RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

smoothstreamingenc: Simplify code by removing a redundant variable 

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-10-06 10:06:37 +03:00
parent bd239c9a2e
commit 8bef433881
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/smoothstreamingenc.c
View File

@ -516,7 +516,7 @@ static int ism_flush(AVFormatContext *s, int final)
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];
char filename[1024], target_filename[1024], header_filename[1024]; char filename[1024], target_filename[1024], header_filename[1024];
int64_t start_pos = os->tail_pos, size; int64_t size;
int64_t start_ts, duration, moof_size; int64_t start_ts, duration, moof_size;
if (!os->packets_written) if (!os->packets_written)
continue; continue;
@ -534,14 +534,15 @@ static int ism_flush(AVFormatContext *s, int final)
ffurl_close(os->out); ffurl_close(os->out);
os->out = NULL; os->out = NULL;
size = os->tail_pos - start_pos; size = os->tail_pos - os->cur_start_pos;
if ((ret = parse_fragment(s, filename, &start_ts, &duration, &moof_size, size)) < 0) if ((ret = parse_fragment(s, filename, &start_ts, &duration, &moof_size, size)) < 0)
break; break;
snprintf(header_filename, sizeof(header_filename), "%s/FragmentInfo(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts); snprintf(header_filename, sizeof(header_filename), "%s/FragmentInfo(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts);
snprintf(target_filename, sizeof(target_filename), "%s/Fragments(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts); snprintf(target_filename, sizeof(target_filename), "%s/Fragments(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts);
copy_moof(s, filename, header_filename, moof_size); copy_moof(s, filename, header_filename, moof_size);
rename(filename, target_filename); rename(filename, target_filename);
add_fragment(os, target_filename, header_filename, start_ts, duration, start_pos, size); add_fragment(os, target_filename, header_filename, start_ts, duration,
os->cur_start_pos, size);
} }
if (c->window_size || (final && c->remove_at_exit)) { if (c->window_size || (final && c->remove_at_exit)) {