[FFmpeg-cvslog] Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'
Michael Niedermayer
git at videolan.org
Thu May 8 22:45:24 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 8 21:54:07 2014 +0200| [996fffbbb3c2a511ce285d651a4edb1734ccde0f] | committer: Michael Niedermayer
Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'
* commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e':
rtmpproto: Check the buffer sizes when copying app/playpath strings
Conflicts:
libavformat/rtmpproto.c
See: 0c2a6dabced53b4df57aedf47f0c1b8233035fed
See: 02ac3398eb52679301028c2fd3ebad1b6261b4da
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=996fffbbb3c2a511ce285d651a4edb1734ccde0f
---
More information about the ffmpeg-cvslog
mailing list