[FFmpeg-cvslog] Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 00:33:08 2014 +0100| [6b0f54ddc746fe2b7939d279837051a427f85b62] | committer: Michael Niedermayer

Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
  mpegts: Support running the write_trailer function without an AVIOContext

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b0f54ddc746fe2b7939d279837051a427f85b62
---