Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 00:11:02 +0000 (02:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 00:13:46 +0000 (02:13 +0200)
commit1d7544b752e73c4c554caca3dfc22ba23050f879
tree4c35764ff335b24a5d060dedde3667bd35eeb0d4
parentaf5ec182252d869c62e327b3b2ffe3dc043fabbd
parente8049af1325dd59a51546c15b2e71a0f578e9d27
Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'

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

Conflicts:
libavformat/mpegtsenc.c

See: 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegtsenc.c