From cdb297cf600615dd9cc74b91b8b9a1b6c391261e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ck?= Date: Sun, 4 Dec 2016 15:37:25 +0100 Subject: [PATCH] fix ffmpeg unicode filename handling; fixes #221 --- CHANGES.rst | 1 + madmom/audio/ffmpeg.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7ccca238f..2a7c72900 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -12,6 +12,7 @@ Bug fixes: * Fix tempo handling of multi-track MIDI files (#219) * Fix error loading unicode filenames (#223) +* Fix ffmpeg unicode filename handling (#236) Other changes: diff --git a/madmom/audio/ffmpeg.py b/madmom/audio/ffmpeg.py index cba60c9ef..79578f4a2 100644 --- a/madmom/audio/ffmpeg.py +++ b/madmom/audio/ffmpeg.py @@ -100,8 +100,6 @@ def _ffmpeg_call(infile, output, fmt='f32le', sample_rate=None, num_channels=1, in_ac = str(int(infile.num_channels)) in_ar = str(int(infile.sample_rate)) infile = str("pipe:0") - elif isinstance(infile, str): - infile = infile.encode(sys.getfilesystemencoding()) else: infile = str(infile) # general options