ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Sat Aug 30 20:21:17 2014 +0200| [807b7388402eb53c2022428f17dfbeaf8312ba74] | committer: Michael Niedermayer
Merge commit 'addbaf134836aea4e14f73add8c6d753a1373257' into release/1.1 * commit 'addbaf134836aea4e14f73add8c6d753a1373257': mpegts: Do not try to write a PMT larger than SECTION_SIZE Conflicts: libavformat/mpegtsenc.c See: 694c3a13c9489c6e05f88486b489dd0746d114fc Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=807b7388402eb53c2022428f17dfbeaf8312ba74 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog