[FFmpeg-cvslog] Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'
Michael Niedermayer
git at videolan.org
Fri Apr 3 21:09:18 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 3 20:53:52 2015 +0200| [5b97681eaa5aed5103519deed4a706b89a910746] | committer: Michael Niedermayer
Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'
* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b97681eaa5aed5103519deed4a706b89a910746
---
More information about the ffmpeg-cvslog
mailing list