Merge commit 'fc308b30bb24e623fed042ec78b10803b2362a18'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:41:45 +0000 (00:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:42:07 +0000 (00:42 +0100)
* commit 'fc308b30bb24e623fed042ec78b10803b2362a18':
  rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc_mpegts.c

Simple merge