[FFmpeg-cvslog] Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'
Michael Niedermayer
git at videolan.org
Thu Aug 14 02:20:14 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 02:11:02 2014 +0200| [1d7544b752e73c4c554caca3dfc22ba23050f879] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d7544b752e73c4c554caca3dfc22ba23050f879
---
More information about the ffmpeg-cvslog
mailing list