diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-08 21:54:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-08 22:44:58 +0200 |
| commit | 996fffbbb3c2a511ce285d651a4edb1734ccde0f (patch) | |
| tree | b0077306a4b96fc2369f63a929ee240be5d5272f /libavfilter/vf_phase.c | |
| parent | 126927c58e1636f6623ba6461ec311df9cb6aa3c (diff) | |
| parent | 0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e (diff) | |
| download | ffmpeg-996fffbbb3c2a511ce285d651a4edb1734ccde0f.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavfilter/vf_phase.c')
0 files changed, 0 insertions, 0 deletions