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)
commita701a9cff4d53791ff811ebeaf1a644fca74191c
treefc32db26994c5f5c508b2ccf4e3aea67863965fe
parent6b0f54ddc746fe2b7939d279837051a427f85b62
parentfc308b30bb24e623fed042ec78b10803b2362a18
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>
libavformat/rtpenc_mpegts.c