* commit 'e96406ed':
  rtsp: Add support for depacketizing RTP data via custom IO

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