30aa9b727d
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39': rtsp: suppress a incompatible pointer types warning Conflicts: libavformat/rtsp.c See: 00792322990188b1130ef2befd68ec1d51ab7365 Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.