projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7ba03a fb2012d)
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 10 Oct 2014 11:02:50 +0000 (11:02 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 10 Oct 2014 11:02:50 +0000 (11:02 +0000)

Trivial merge
Domain: Multimedia / Media Vision;