Skip to content

Commit

Permalink
Fixing a minor syntax error
Browse files Browse the repository at this point in the history
  • Loading branch information
sverrirs committed Dec 4, 2016
1 parent 0e15f5a commit dba1cf4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Mp4box Concatination Helper

Assists in concatinating files using the `mp4box` utility.
The tool creates a chapter file for all concatinated files and the resulting joined file will have chapter marks at the joining points.
Assists in concatenating files using the `mp4box` utility.
The tool creates a chapter file for all concatenated files and the resulting joined file will have chapter marks at the joining points.

# Usage
## Usage
Assuming you have a bunch of videos named "clipsXX.mp4" in a folder called _videos_ then this is how you feed all of them into the concatinator and specify an output file

```
Expand Down
6 changes: 3 additions & 3 deletions src/catgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ def parseMp4boxMediaInfo(file_name, mp4box_path, regex_mp4box_duration):
# Locates the mp4box executable and returns a full path to it
def findMp4Box(path_to_gpac_install=None):

if(not path_to_gpac_install is None and os.path.isfile(os.path.join(path_to_gpac_install, "mp4box.exe")))
if( not path_to_gpac_install is None and os.path.isfile(os.path.join(path_to_gpac_install, "mp4box.exe")) ):
return os.path.join(path_to_gpac_install, "mp4box.exe")

# Attempts to search for it under C:\Program Files\GPAC
if( os.path.isfile("C:\\Program Files\\GPAC\\mp4box.exe"))
if( os.path.isfile("C:\\Program Files\\GPAC\\mp4box.exe")):
return "C:\\Program Files\\GPAC\\mp4box.exe"

# For 32 bit installs
if( os.path.isfile("C:\\Program Files\\GPAC\\mp4box.exe"))
if( os.path.isfile("C:\\Program Files\\GPAC\\mp4box.exe")):
return "C:\\Program Files (x86)\\GPAC\\mp4box.exe"

# Throw an error
Expand Down

0 comments on commit dba1cf4

Please sign in to comment.