[FFmpeg-cvslog] Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'
Michael Niedermayer
git at videolan.org
Wed Apr 29 05:46:39 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 04:24:06 2015 +0200| [12f7253d0ea11c44ac01e1727a2724df060530a8] | committer: Michael Niedermayer
Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'
* commit '82de8d71118f4eafd6a43e9ea9169bd411793798':
mpegts: Update the PSI/SI table only if the version change
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12f7253d0ea11c44ac01e1727a2724df060530a8
---
More information about the ffmpeg-cvslog
mailing list