Skip to content

Commit 3b642b2

Browse files
BreakthroughBreakthrough
committed
Merge branch 'main' into releases/0.6.4
2 parents 6a1e2fe + 8601b95 commit 3b642b2

File tree

8 files changed

+157
-133
lines changed

8 files changed

+157
-133
lines changed

‎CITATION.cff‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
cff-version: 1.2.0
2+
title: PySceneDetect
3+
message: www.scenedetect.com
4+
type: software
5+
authors:
6+
- given-names: Brandon
7+
family-names: Castellano
8+
affiliation: www.bcastell.com
9+
repository-code: 'https://github.com/Breakthrough/PySceneDetect'
10+
url: 'https://www.scenedetect.com'
11+
abstract: Video Cut Detection and Analysis Tool
12+
license: BSD-3-Clause

‎LICENSE‎

Lines changed: 24 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,28 @@
1-
By downloading, copying, installing, or using this software, you agree
2-
to the terms of this license, and those contained in the "Ancillary
3-
Software Licenses" section below. If you do not agree to any of these
4-
terms or licenses, do not download, install, copy, or use the software
5-
or any other material included in in distribution.
1+
BSD 3-Clause License
62

7-
-----------------------------------------------------------------------
8-
9-
PySceneDetect License (BSD 3-Clause)
10-
< http://www.bcastell.com/projects/PySceneDetect >
11-
12-
Copyright (C) 2014-2024, Brandon Castellano.
13-
All rights reserved.
3+
Copyright (C) 2024, Brandon Castellano
144

155
Redistribution and use in source and binary forms, with or without
16-
modification, are permitted provided that the following conditions
17-
are met:
18-
19-
1. Redistributions of source code must retain the above copyright
20-
notice, this list of conditions and the following disclaimer.
21-
22-
2. Redistributions in binary form must reproduce the above
23-
copyright notice, this list of conditions and the following
24-
disclaimer in the documentation and/or other materials
25-
provided with the distribution.
26-
27-
3. Neither the name of the copyright holder nor the names of its
28-
contributors may be used to endorse or promote products derived
29-
from this software without specific prior written permission.
30-
31-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
32-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
33-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
34-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
35-
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
36-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
37-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
38-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
39-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
40-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6+
modification, are permitted provided that the following conditions are met:
7+
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
10+
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4128
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42-
43-
-----------------------------------------------------------------------
44-
45-
Ancillary Software Licenses
46-
47-
This software uses the following third-party open source libraries and
48-
are released under the terms detailed below. By downloading, copying,
49-
installing or using this software/tutorial, you agree to these terms.
50-
51-
-----------------------------------------------------------------------
52-
53-
54-
> click [Copyright (C) 2017, Armin Ronacher]:
55-
This software uses OpenCV; see thirdparty/LICENSE-CLICK or visit:
56-
[ http://click.pocoo.org/license/ ]
57-
58-
> NumPy [Copyright (C) 2005-2016, Numpy Developers]:
59-
This software uses Numpy; see thirdparty/LICENSE-NUMPY or visit:
60-
[ http://www.numpy.org/license.html ]
61-
62-
> OpenCV [Copyright (C) 2017, Itseez]:
63-
This software uses OpenCV; see thirdparty/LICENSE-OPENCV or visit:
64-
[ http://opencv.org/license.html ]
65-
66-
> PyAV [Copyright (C) 2017, Mike Boers and others]:
67-
This software uses PyAV; see thirdparty/LICENSE-PYAV or visit:
68-
[ https://github.com/PyAV-Org/PyAV/blob/main/LICENSE.txt ]
69-
70-
> pytest [Copyright (C) 2004-2017, Holger Krekel and others]:
71-
This software uses pytest; see thirdparty/LICENSE-PYTEST or visit:
72-
[ https://docs.pytest.org/en/latest/license.html ]
73-
74-
> simpletable [Copyright (C) 2014-2019, Matheus Vieira Portela and others]:
75-
This software uses simpletable; see thirdparty/LICENSE-SIMPLETABLE or visit:
76-
[ https://github.com/matheusportela/simpletable/blob/master/LICENSE ]
77-
78-
> tqdm [Copyright (C) 2013-2018, Casper da Costa-Luis,
79-
Google Inc., and Noam Yorav-Raphael]:
80-
This software uses tqdm; see thirdparty/LICENSE-TQDM or visit:
81-
[ https://github.com/tqdm/tqdm/blob/master/LICENCE ]
82-
83-
84-
-----------------------------------------------------------------------
85-
86-
This software may also invoke FFmpeg or mkvmerge, if available. If required,
87-
these programs can be obtained from following URLs:
88-
89-
FFmpeg: [ https://ffmpeg.org/download.html ]
90-
mkvmerge: [ https://mkvtoolnix.download/downloads.html ]
91-
92-
Once installed, ensure the program is in your PATH variable (i.e. you can
93-
run the `ffmpeg` or `mkvmerge` command from any location).
94-
95-
Certain distributions of PySceneDetect may include ffmpeg. See
96-
thirdparty/LICENSE-FFMPEG file or visit [ https://ffmpeg.org ]
97-
98-
FFmpeg is a trademark of Fabrice Bellard
99-
mkvmerge is Copyright (C) 2005-2016, Matroska
100-
101-
Windows distributions may include a compiled Python distribution. For license
102-
information regarding the distributed version of Python, see the
103-
thirdparty/LICENSE-PYTHON file, or visit [ https://docs.python.org/3/license.html ]

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
![PySceneDetect](https://raw.githubusercontent.com/Breakthrough/PySceneDetect/main/website/pages/img/pyscenedetect_logo_small.png)
33
==========================================================
4-
Video Scene Cut Detection and Analysis Tool
4+
Video Cut Detection and Analysis Tool
55
----------------------------------------------------------
66

77
[![Build Status](https://img.shields.io/github/actions/workflow/status/Breakthrough/PySceneDetect/build.yml)](https://github.com/Breakthrough/PySceneDetect/actions)
@@ -117,7 +117,9 @@ This program uses free code signing provided by [SignPath.io](https://signpath.i
117117

118118
## License
119119

120-
Licensed under BSD 3-Clause (see the `LICENSE` file for details).
120+
BSD-3-Clause; see [`LICENSE`](LICENSE) and [`THIRD-PARTY.md`](THIRD-PARTY.md) for details.
121+
122+
----------------------------------------------------------
121123

122124
Copyright (C) 2014-2024 Brandon Castellano.
123125
All rights reserved.

‎THIRD-PARTY.md‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Ancillary Software Licenses
2+
3+
This file includes license information for various open-source projects
4+
that are imported, derived into, or distributed with PySceneDetect.
5+
See [LICENSE](LICENSE) for the main PySceneDetect license.
6+
7+
Depending on the features being used, PySceneDetect uses the following
8+
third-party software which are released under the terms detailed below.
9+
By downloading, copying, installing or using this software, you agree
10+
to these terms.
11+
12+
In no particular order:
13+
14+
-----------------------------------------------------------------------
15+
16+
> click [Copyright (C) 2017, Armin Ronacher]:
17+
This software uses OpenCV; see thirdparty/LICENSE-CLICK or visit:
18+
[ http://click.pocoo.org/license/ ]
19+
20+
> NumPy [Copyright (C) 2005-2016, Numpy Developers]:
21+
This software uses Numpy; see thirdparty/LICENSE-NUMPY or visit:
22+
[ http://www.numpy.org/license.html ]
23+
24+
> OpenCV [Copyright (C) 2017, Itseez]:
25+
This software uses OpenCV; see thirdparty/LICENSE-OPENCV or visit:
26+
[ http://opencv.org/license.html ]
27+
28+
> PyAV [Copyright (C) 2017, Mike Boers and others]:
29+
This software uses PyAV; see thirdparty/LICENSE-PYAV or visit:
30+
[ https://github.com/PyAV-Org/PyAV/blob/main/LICENSE.txt ]
31+
32+
> pytest [Copyright (C) 2004-2017, Holger Krekel and others]:
33+
This software uses pytest; see thirdparty/LICENSE-PYTEST or visit:
34+
[ https://docs.pytest.org/en/latest/license.html ]
35+
36+
> simpletable [Copyright (C) 2014-2019, Matheus Vieira Portela and others]:
37+
This software uses simpletable; see thirdparty/LICENSE-SIMPLETABLE or visit:
38+
[ https://github.com/matheusportela/simpletable/blob/master/LICENSE ]
39+
40+
> tqdm [Copyright (C) 2013-2018, Casper da Costa-Luis,
41+
Google Inc., and Noam Yorav-Raphael]:
42+
This software uses tqdm; see thirdparty/LICENSE-TQDM or visit:
43+
[ https://github.com/tqdm/tqdm/blob/master/LICENCE ]
44+
45+
> MoviePy [ Copyright (C) 2015 Zulko ]
46+
This software uses tqdm; see thirdparty/LICENSE-TQDM or visit:
47+
[ https://github.com/Zulko/moviepy/blob/master/LICENCE.txt ]
48+
49+
-----------------------------------------------------------------------
50+
51+
This software may also invoke FFmpeg or mkvmerge, if available. If required,
52+
these programs can be obtained from following URLs:
53+
54+
FFmpeg: [ https://ffmpeg.org/download.html ]
55+
mkvmerge: [ https://mkvtoolnix.download/downloads.html ]
56+
57+
Once installed, ensure the program is in your PATH variable (i.e. you can
58+
run the `ffmpeg` or `mkvmerge` command from any location).
59+
60+
Certain distributions of PySceneDetect may include ffmpeg. See
61+
thirdparty/LICENSE-FFMPEG file or visit [ https://ffmpeg.org ]
62+
63+
FFmpeg is a trademark of Fabrice Bellard
64+
mkvmerge is Copyright (C) 2005-2016, Matroska
65+
66+
Windows distributions may include a compiled Python distribution. For license
67+
information regarding the distributed version of Python, see the
68+
thirdparty/LICENSE-PYTHON file, or visit [ https://docs.python.org/3/license.html ]
69+
70+
-----------------------------------------------------------------------
71+
72+
If any information above is incorrect, please let us know.
73+
Visit [ https://www.scenedetect.com ] for contact information.
74+
75+

‎dist/pre_release.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# -*- coding: utf-8 -*-
22
import os
33
import sys
4-
import xml
54
sys.path.append(os.path.abspath("."))
65

76
import scenedetect
87
VERSION = scenedetect.__version__
98

10-
11-
installer_aip = ''
12-
with open("dist/installer/PySceneDetect.aip", "r") as f:
13-
installer_aip = f.read()
9+
if len(sys.argv) <= 2 or not ("--ignore-installer" in sys.argv):
10+
installer_aip = ''
11+
with open("dist/installer/PySceneDetect.aip", "r") as f:
12+
installer_aip = f.read()
1413

1514
aip_version = f"<ROW Property=\"ProductVersion\" Value=\"{VERSION}\" Options=\"32\"/>"
1615

‎scenedetect/_cli/__init__.py‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,50 +45,33 @@
4545
# About & copyright message string shown for the 'about' CLI command (scenedetect about).
4646
_ABOUT_STRING = """
4747
Site: http://scenedetect.com/
48-
Docs: http://manual.scenedetect.com/
48+
Docs: https://www.scenedetect.com/docs/
4949
Code: https://github.com/Breakthrough/PySceneDetect/
5050
5151
Copyright (C) 2014-2024 Brandon Castellano. All rights reserved.
5252
5353
PySceneDetect is released under the BSD 3-Clause license. See the
54-
included LICENSE file or visit the PySceneDetect website for details.
54+
LICENSE file or visit [ https://www.scenedetect.com/copyright/ ].
5555
This software uses the following third-party components:
5656
5757
> NumPy [Copyright (C) 2018, Numpy Developers]
5858
> OpenCV [Copyright (C) 2018, OpenCV Team]
5959
> click [Copyright (C) 2018, Armin Ronacher]
6060
> simpletable [Copyright (C) 2014 Matheus Vieira Portela]
61+
> PyAV [Copyright (C) 2017, Mike Boers and others]
62+
> MoviePy [Copyright (C) 2015 Zulko]
6163
6264
This software may also invoke the following third-party executables:
6365
6466
> FFmpeg [Copyright (C) 2018, Fabrice Bellard]
6567
> mkvmerge [Copyright (C) 2005-2016, Matroska]
6668
67-
If included with your distribution of PySceneDetect, see the included
68-
LICENSE-FFMPEG and LICENSE-MKVMERGE or visit:
69-
[ https://scenedetect.com/copyright/ ]
69+
Certain distributions of PySceneDetect may include ffmpeg. See
70+
the included LICENSE-FFMPEG or visit [ https://ffmpeg.org ].
7071
71-
FFmpeg and mkvmerge are distributed only with certain PySceneDetect
72-
releases, in order to allow for automatic video splitting capability.
73-
If they were not included with your distribution, they can usually be
74-
installed from your operating system's package manager, or downloaded
75-
from the following URLs:
76-
77-
FFmpeg: [ https://ffmpeg.org/download.html ]
78-
mkvmerge: [ https://mkvtoolnix.download/downloads.html ]
79-
(Note that mkvmerge is a part of the mkvtoolnix package.)
80-
81-
Once installed, ensure the respective program can be accessed from the
82-
same location running PySceneDetect by calling the `ffmpeg` or
83-
`mkvmerge` command from a terminal/command prompt.
84-
85-
PySceneDetect will automatically use whichever program is available on
86-
the computer, depending on the specified command-line options.
87-
88-
Additionally, certain Windows distributions may include a compiled
89-
Python distribution. For license information regarding the distributed
90-
version of Python, see the included LICENSE-PYTHON file for details,
91-
or visit the following URL: [ https://docs.python.org/3/license.html ]
72+
Binary distributions of PySceneDetect include a compiled Python
73+
distribution. See the included LICENSE-PYTHON file, or visit
74+
[ https://docs.python.org/3/license.html ].
9275
9376
THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED.
9477
"""

‎scenedetect/_thirdparty/LICENSE-MOVIEPY‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
MoviePy license
2+
Copyright (c) 2015 Zulko
3+
4+
URL: https://github.com/Zulko/moviepy/blob/master/LICENCE.txt
5+
6+
-----------------------------------------------------------------------
7+
8+
The MIT License (MIT)
9+
10+
Copyright (c) 2015 Zulko
11+
12+
Permission is hereby granted, free of charge, to any person obtaining a copy
13+
of this software and associated documentation files (the "Software"), to deal
14+
in the Software without restriction, including without limitation the rights
15+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
16+
copies of the Software, and to permit persons to whom the Software is
17+
furnished to do so, subject to the following conditions:
18+
19+
The above copyright notice and this permission notice shall be included in
20+
all copies or substantial portions of the Software.
21+
22+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
23+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
24+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
25+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
26+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
27+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
28+
THE SOFTWARE.

‎website/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
mkdocs==1.5.2
2-
jinja2==3.1.3
2+
jinja2==3.1.4

0 commit comments

Comments
 (0)