Merge commit '46c0cbd5'
* commit '46c0cbd5': rtsp: suppress a incompatible pointer types warning Conflicts: libavformat/rtsp.c See: 00792322Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '46c0cbd5': rtsp: suppress a incompatible pointer types warning Conflicts: libavformat/rtsp.c See: 00792322Merged-by: Michael Niedermayer <michaelni@gmx.at>