0x2620/oxtimelines
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

only use frombytes, exists for a long time

Browse source
This commit is contained in:
j 2016-06-16 13:55:29 +02:00
parent 82ddda4fb7
commit 150639ced3
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
oxtimelines/ffmpeg.py
View file

@ -118,14 +118,11 @@ def video(path, height=96, info=None, framerate=FPS):
data = p.stdout.read(nbytes) data = p.stdout.read(nbytes)
if len(data) != nbytes: if len(data) != nbytes:
if first: if first:
raise IOError("ERROR: could not open file %s" % path ) raise IOError("ERROR: could not open file %s" % path)
else: else:
return return
else: else:
first = False first = False
if hasattr(Image, 'fromstring'):
yield Image.fromstring('RGB', (width, height), data)
else:
yield Image.frombytes('RGB', (width, height), data) yield Image.frombytes('RGB', (width, height), data)
def audio(path, info=None, samplerate=48000, framerate=FPS): def audio(path, info=None, samplerate=48000, framerate=FPS):