* commit 'e3ec6fe7':
  rtsp: Add a buffer_size option

Conflicts:
	libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>