From 5fa43f76aa717789d864c402a44d801dac9480df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sat, 6 Oct 2012 02:33:06 +0300
Subject: [PATCH] smoothstreamingenc: Properly return errors from ism_flush to
the caller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/smoothstreamingenc.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 7ee640a931..d86e87fc05 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -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;
}
@@ -561,13 +562,15 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt)
AVStream *st = s->streams[pkt->stream_index];
OutputStream *os = &c->streams[pkt->stream_index];
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) &&
av_compare_ts(pkt->pts, st->time_base,
end_pts, AV_TIME_BASE_Q) >= 0 &&
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++;
}