Skip to content
Snippets Groups Projects
Commit 996fffbb authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '0bacfa8d'


* commit '0bacfa8d':
  rtmpproto: Check the buffer sizes when copying app/playpath strings

Conflicts:
	libavformat/rtmpproto.c

See: 0c2a6dab
See: 02ac3398
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 126927c5 0bacfa8d
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment