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)
* commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b':
  rtsp: check ffurl_get_file_handle() return value

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

Simple merge