ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Aug
23 02:32:04 2014 +0200| [afbaf6b367e17b487864ac37fb42fed6c274c500] | committer:
Michael Niedermayer
Merge commit '7788297a59656ececd84f602292bfeb79f7eedd7' into release/2.2
* commit '7788297a59656ececd84f602292bfeb79f7eedd7':
mpegts: Do not try to write a PMT larger than SECTION_SIZE
Conflicts:
libavformat/mpegtsenc.c
See: 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afbaf6b367e17b487864ac37fb42fed6c274c500
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
