Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:04:19 +0000 (05:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:04:24 +0000 (05:04 +0100)
commitbf6e332cb4b7a2aabff6373eaa4b0b768c53c102
treec5cf12d873aba0c65afdf4267f89d05a48c96a3a
parent988d27b8029d9b4ccb13e792004cc8375b835eac
parent76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b
Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'

* commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b':
  rtsp: check ffurl_get_file_handle() return value

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