eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'fc308b30bb'

Browse source 
* commit 'fc308b30bb':
  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
commit a701a9cff4
1 changed files with 1 additions and 3 deletions
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; struct MuxChain *chain = s->priv_data;
if (chain->mpegts_ctx) { if (chain->mpegts_ctx) {
if (!chain->mpegts_ctx->pb) av_write_trailer(chain->mpegts_ctx);
avio_open_dyn_buf(&chain->mpegts_ctx->pb);
if (chain->mpegts_ctx->pb) { if (chain->mpegts_ctx->pb) {
uint8_t *buf; uint8_t *buf;
av_write_trailer(chain->mpegts_ctx);
avio_close_dyn_buf(chain->mpegts_ctx->pb, &buf); avio_close_dyn_buf(chain->mpegts_ctx->pb, &buf);
av_free(buf); av_free(buf);
} }