Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:39:05 +0000 (21:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:39:05 +0000 (21:39 +0100)
commit1537d0b432d8cad62b6c8af1960674ac452be7ac
tree533644aa37f8da86b6d718ab61206ddf7244c1c4
parent61d0a6dd9554ecd705518d38d531363cdabab7d3
parent604c9b1196c70d79bbbc1f23e75f6a8253a74da3
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@gmx.at>
libavformat/rtsp.c