Commit 5fa43f76 authored by Martin Storsjö's avatar Martin Storsjö

smoothstreamingenc: Properly return errors from ism_flush to the caller

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent eb2f3910
...@@ -551,7 +551,8 @@ static int ism_flush(AVFormatContext *s, int final) ...@@ -551,7 +551,8 @@ static int ism_flush(AVFormatContext *s, int final)
} }
} }
write_manifest(s, final); if (ret >= 0)
ret = write_manifest(s, final);
return ret; return ret;
} }
...@@ -561,13 +562,15 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -561,13 +562,15 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt)
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
OutputStream *os = &c->streams[pkt->stream_index]; OutputStream *os = &c->streams[pkt->stream_index];
int64_t end_pts = (c->nb_fragments + 1) * c->min_frag_duration; int64_t end_pts = (c->nb_fragments + 1) * c->min_frag_duration;
int ret;
if ((!c->has_video || st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && if ((!c->has_video || st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
av_compare_ts(pkt->pts, st->time_base, av_compare_ts(pkt->pts, st->time_base,
end_pts, AV_TIME_BASE_Q) >= 0 && end_pts, AV_TIME_BASE_Q) >= 0 &&
pkt->flags & AV_PKT_FLAG_KEY && os->packets_written) { pkt->flags & AV_PKT_FLAG_KEY && os->packets_written) {
ism_flush(s, 0); if ((ret = ism_flush(s, 0)) < 0)
return ret;
c->nb_fragments++; c->nb_fragments++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment