cleanup imports
This commit is contained in:
parent
791029be58
commit
dd0e0dbab7
4 changed files with 5 additions and 15 deletions
|
@ -5,16 +5,12 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
from glob import glob
|
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
|
||||||
import Image
|
|
||||||
|
|
||||||
root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..')
|
root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..')
|
||||||
if os.path.exists(os.path.join(root, 'oxtimelines')):
|
if os.path.exists(os.path.join(root, 'oxtimelines')):
|
||||||
sys.path.insert(0, root)
|
sys.path.insert(0, root)
|
||||||
|
|
||||||
import ox
|
|
||||||
import oxtimelines
|
import oxtimelines
|
||||||
|
|
||||||
# fixme: -w option should be 'keyframeswide' mode
|
# fixme: -w option should be 'keyframeswide' mode
|
||||||
|
|
|
@ -4,12 +4,4 @@
|
||||||
__version__ = 'git'
|
__version__ = 'git'
|
||||||
|
|
||||||
|
|
||||||
from glob import glob
|
|
||||||
import math
|
|
||||||
import os
|
|
||||||
import time
|
|
||||||
|
|
||||||
import Image
|
|
||||||
|
|
||||||
import timeline
|
|
||||||
from timeline import Timelines
|
from timeline import Timelines
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vi:si:et:sw=4:sts=4:ts=4
|
# vi:si:et:sw=4:sts=4:ts=4
|
||||||
# GPL 2014
|
# GPL 2014
|
||||||
|
|
||||||
from __future__ import division, with_statement, print_function
|
from __future__ import division, with_statement, print_function
|
||||||
|
|
||||||
import fractions
|
import fractions
|
||||||
|
@ -11,6 +10,7 @@ import Image
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import ox
|
import ox
|
||||||
|
|
||||||
|
|
||||||
FFMPEG = None
|
FFMPEG = None
|
||||||
for cmd in ('ffmpeg', 'avconv'):
|
for cmd in ('ffmpeg', 'avconv'):
|
||||||
cmd = ox.file.cmd(cmd)
|
cmd = ox.file.cmd(cmd)
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vi:si:et:sw=4:sts=4:ts=4
|
# vi:si:et:sw=4:sts=4:ts=4
|
||||||
# GPL 2008-2014
|
# GPL 2008-2014
|
||||||
|
|
||||||
from __future__ import division, with_statement, print_function
|
from __future__ import division, with_statement, print_function
|
||||||
|
|
||||||
from glob import glob
|
from glob import glob
|
||||||
|
from time import time
|
||||||
import Image
|
import Image
|
||||||
import math
|
import math
|
||||||
import os
|
import os
|
||||||
from time import time
|
|
||||||
import ox
|
import ox
|
||||||
|
|
||||||
from .ffmpeg import Video
|
from .ffmpeg import Video
|
||||||
|
|
||||||
|
|
||||||
FPS = 25
|
FPS = 25
|
||||||
|
|
||||||
class Timelines():
|
class Timelines():
|
||||||
|
|
Loading…
Reference in a new issue