projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f6d12c
)
test commit for Buildbot
author
Alexander Shishkov
<no@email>
Mon, 9 Apr 2012 20:17:02 +0000
(20:17 +0000)
committer
Alexander Shishkov
<no@email>
Mon, 9 Apr 2012 20:17:02 +0000
(20:17 +0000)
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index
1d1a6a4
..
d486f11
100755
(executable)
--- a/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@
-18,7
+18,7
@@
// are permitted provided that the following conditions are met:
//
// * Redistribution's of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
+// this list of conditions and the following disclaimer.
//
// * Redistribution's in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation