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

Conflicts:
	libavformat/rtmpproto.c

See: 0c2a6dab
See: 02ac3398Merged-by: Michael Niedermayer <michaelni@gmx.at>