[FFmpeg-cvslog] Merge commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 19:08:55 2014 +0200| [437a0ae1a1059296cb7c06973126dee5097d6ab3] | committer: Michael Niedermayer

Merge commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117' into release/0.10

* commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
	libavformat/mpegtsenc.c

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

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