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

Merge commit 'fc308b30bb24e623fed042ec78b10803b2362a18' 

* commit 'fc308b30bb24e623fed042ec78b10803b2362a18':
  rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-20 00:41:45 +01:00
parent 6b0f54ddc7 fc308b30bb
commit a701a9cff4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpenc_mpegts.c
View File

@ -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);
}