[FFmpeg-cvslog] Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
Michael Niedermayer
git at videolan.org
Thu Dec 12 19:46:50 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 19:36:09 2013 +0100| [30aa9b727da05d9bf3346ffabdbc983bd5f37616] | committer: Michael Niedermayer
Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
rtsp: suppress a incompatible pointer types warning
Conflicts:
libavformat/rtsp.c
See: 00792322990188b1130ef2befd68ec1d51ab7365
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30aa9b727da05d9bf3346ffabdbc983bd5f37616
---
More information about the ffmpeg-cvslog
mailing list