ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Oct 10 21:05:49 2014 +0200| [544f8114534457e2d2ea04aaffa3b4986d6c8130] | committer: Michael Niedermayer
Merge commit 'c27328e749ff3be648411765cd17362fee017341' * commit 'c27328e749ff3be648411765cd17362fee017341': rtsp: Check for command strings without spaces Conflicts: libavformat/rtspdec.c See: a0568ed2544025de3c66dd500811f5ba43f38af4 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=544f8114534457e2d2ea04aaffa3b4986d6c8130 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog