[FFmpeg-cvslog] Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  1 21:27:45 2015 +0200| [53bf6b155cee8cdf0fd12fe49e4ccfb9cf6714a2] | committer: Michael Niedermayer

Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

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

Conflicts:
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53bf6b155cee8cdf0fd12fe49e4ccfb9cf6714a2
---