* commit '604c9b11':
  rtsp: move the CONFIG_ macros to the beginning of the check

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