summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc_mpegts.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-12-19 15:26:23 +0200
committerMartin Storsjö <martin@martin.st>2014-12-19 23:14:45 +0200
commitfc308b30bb24e623fed042ec78b10803b2362a18 (patch)
tree073958dc98b01f49a10c1fa95b8449d22575c760 /libavformat/rtpenc_mpegts.c
parente2ce16392205d8efe9143329ed3fb5fcb15498fa (diff)
downloadffmpeg-fc308b30bb24e623fed042ec78b10803b2362a18.tar.gz
rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists
Since the mpegts muxer now can handle being called with a NULL AVIOContext, we don't need to try to allocate one before calling write_trailer. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpenc_mpegts.c')
-rw-r--r--libavformat/rtpenc_mpegts.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c
index 4e243f0bd8..f170f97934 100644
--- a/libavformat/rtpenc_mpegts.c
+++ b/libavformat/rtpenc_mpegts.c
@@ -32,11 +32,9 @@ static int rtp_mpegts_write_close(AVFormatContext *s)
struct MuxChain *chain = s->priv_data;
if (chain->mpegts_ctx) {
- if (!chain->mpegts_ctx->pb)
- avio_open_dyn_buf(&chain->mpegts_ctx->pb);
+ av_write_trailer(chain->mpegts_ctx);
if (chain->mpegts_ctx->pb) {
uint8_t *buf;
- av_write_trailer(chain->mpegts_ctx);
avio_close_dyn_buf(chain->mpegts_ctx->pb, &buf);
av_free(buf);
}