ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19 05:13:59 2014 +0100| [c054cff87a3329a1e55abc9cd2659f790f09678e] | committer: Michael Niedermayer
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788' * commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788': xcbgrab: Move NULL check before pointer dereference Conflicts: libavdevice/xcbgrab.c See: e86df0206f06b8d1e97e2b60db8f74a398d53127 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c054cff87a3329a1e55abc9cd2659f790f09678e --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog