Skip to content

Commit 81f826d

Browse files
OpenCV BuildbotAndrey Kamaev
OpenCV Buildbot
authored and
Andrey Kamaev
committed
Normalize line endings and whitespace
1 parent 0442bca commit 81f826d

File tree

1,511 files changed

+261410
-261356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,511 files changed

+261410
-261356
lines changed

.gitattributes

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
.git* export-ignore
2+
3+
* text=auto
4+
* whitespace=!indent,trail,space
5+
6+
*.py text whitespace=tab-in-indent,trail,space,fix
7+
*.cpp text whitespace=tab-in-indent,trail,space,fix
8+
*.hpp text whitespace=tab-in-indent,trail,space,fix
9+
*.cxx text whitespace=tab-in-indent,trail,space,fix
10+
*.hxx text whitespace=tab-in-indent,trail,space,fix
11+
*.mm text whitespace=tab-in-indent,trail,space,fix
12+
*.c text whitespace=tab-in-indent,trail,space,fix
13+
*.h text whitespace=tab-in-indent,trail,space,fix
14+
*.i text whitespace=tab-in-indent,trail,space,fix
15+
*.java text whitespace=tab-in-indent,trail,space,fix
16+
*.cu text whitespace=tab-in-indent,trail,space,fix
17+
*.cl text whitespace=tab-in-indent,trail,space,fix
18+
19+
*.cmake text whitespace=tab-in-indent,trail,space,fix
20+
*.cmakein text whitespace=tab-in-indent,trail,space,fix
21+
*.in text whitespace=tab-in-indent,trail,space,fix
22+
CMakeLists.txt text whitespace=tab-in-indent,trail,space,fix
23+
24+
*.rst text whitespace=tab-in-indent,trail,space,fix
25+
26+
*.png binary
27+
*.jepg binary
28+
*.jpg binary
29+
*.exr binary
30+
*.ico binary
31+
32+
*.a binary
33+
*.so binary
34+
*.dll binary
35+
36+
*.pdf binary
37+
*.pbxproj binary
38+
*.vec binary
39+
*.doc binary
40+
41+
*.css_t text
42+
*.qrc text
43+
*.qss text
44+
*.S text
45+
46+
*.xml -text
47+
*.yml -text
48+
49+
*.vcproj text eol=crlf merge=union
50+
*.cproject text eol=crlf merge=union
51+
*.bat text eol=crlf
52+
*.cmd text eol=crlf
53+
*.cmd.tmpl text eol=crlf
54+
55+
*.sh text eol=lf

3rdparty/ffmpeg/ffmpeg_version.cmake

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
set(NEW_FFMPEG 1)
2-
set(HAVE_FFMPEG_CODEC 1)
3-
set(HAVE_FFMPEG_FORMAT 1)
4-
set(HAVE_FFMPEG_UTIL 1)
5-
set(HAVE_FFMPEG_SWSCALE 1)
6-
set(HAVE_GENTOO_FFMPEG 1)
7-
8-
set(ALIASOF_libavcodec_VERSION 53.61.100)
9-
set(ALIASOF_libavformat_VERSION 53.32.100)
10-
set(ALIASOF_libavutil_VERSION 51.35.100)
1+
set(NEW_FFMPEG 1)
2+
set(HAVE_FFMPEG_CODEC 1)
3+
set(HAVE_FFMPEG_FORMAT 1)
4+
set(HAVE_FFMPEG_UTIL 1)
5+
set(HAVE_FFMPEG_SWSCALE 1)
6+
set(HAVE_GENTOO_FFMPEG 1)
7+
8+
set(ALIASOF_libavcodec_VERSION 53.61.100)
9+
set(ALIASOF_libavformat_VERSION 53.32.100)
10+
set(ALIASOF_libavutil_VERSION 51.35.100)
1111
set(ALIASOF_libswscale_VERSION 2.1.100)

0 commit comments

Comments
 (0)