[FFmpeg-cvslog] Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 21:39:05 2014 +0100| [1537d0b432d8cad62b6c8af1960674ac452be7ac] | committer: Michael Niedermayer

Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'

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

Conflicts:
	libavformat/rtsp.c

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

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