From 675fd4608d6242c6478b3ad472bd6067ea644004 Mon Sep 17 00:00:00 2001 From: Vlad Seghete Date: Tue, 1 Oct 2013 20:04:00 -0500 Subject: [PATCH 1/4] fixed Issue #2482 --- lib/matplotlib/animation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py index 295d60d8501f..6815132dc654 100644 --- a/lib/matplotlib/animation.py +++ b/lib/matplotlib/animation.py @@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase): def _args(self): # Returns the command line parameters for subprocess to use # ffmpeg to create a movie using a collection of temp images - return [self.bin_path(), '-vframes', str(self._frame_counter), - '-r', str(self.fps), '-i', - self._base_temp_name()] + self.output_args + return [self.bin_path(), '-i', self._base_temp_name(), + '-vframes', str(self._frame_counter), + '-r', str(self.fps)] + self.output_args # Base class of avconv information. AVConv has identical arguments to From bbca95b764ba1be43ab17bfda6d17d1bbe235ca7 Mon Sep 17 00:00:00 2001 From: Vlad Seghete Date: Thu, 3 Oct 2013 15:57:39 -0500 Subject: [PATCH 2/4] fixed issue where passing an int number of frames to FuncAnimate would result in error --- lib/matplotlib/animation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py index 6815132dc654..9854ca2527f6 100644 --- a/lib/matplotlib/animation.py +++ b/lib/matplotlib/animation.py @@ -1002,7 +1002,7 @@ def __init__(self, fig, func, frames=None, init_func=None, fargs=None, self._iter_gen = lambda: iter(frames) self.save_count = len(frames) else: - self._iter_gen = lambda: xrange(frames) + self._iter_gen = lambda: xrange(frames).__iter__() self.save_count = frames # If we're passed in and using the default, set it to 100. From 670c1261b32c6d8c0a3a82437ce829d82c9f4fa6 Mon Sep 17 00:00:00 2001 From: Vlad Seghete Date: Thu, 3 Oct 2013 16:09:49 -0500 Subject: [PATCH 3/4] added a note in the rc file about 'tight' bbox incompatibility --- matplotlibrc.template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/matplotlibrc.template b/matplotlibrc.template index 44f94fdfd95d..f1eb61a79cec 100644 --- a/matplotlibrc.template +++ b/matplotlibrc.template @@ -372,7 +372,11 @@ backend : %(backend)s #savefig.facecolor : white # figure facecolor when saving #savefig.edgecolor : white # figure edgecolor when saving #savefig.format : png # png, ps, pdf, svg -#savefig.bbox : standard # 'tight' or 'standard'. +#savefig.bbox : standard # 'tight' or 'standard'. 'tight' is incompatible with + # pipe-based animation backends but will work with + # temporary file based ones: e.g. setting + # animation.writer to ffmpeg will not work, + # use ffmpeg_file instead #savefig.pad_inches : 0.1 # Padding to be used when bbox is set to 'tight' #savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality parameter. #savefig.directory : ~ # default directory in savefig dialog box, From ba527525d9982dadcdc776f04a7e63c8a05c09ce Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 29 Oct 2013 11:26:30 -0500 Subject: [PATCH 4/4] moved incompatibility comment on its own line --- matplotlibrc.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/matplotlibrc.template b/matplotlibrc.template index f1eb61a79cec..c43e43c216d2 100644 --- a/matplotlibrc.template +++ b/matplotlibrc.template @@ -372,10 +372,10 @@ backend : %(backend)s #savefig.facecolor : white # figure facecolor when saving #savefig.edgecolor : white # figure edgecolor when saving #savefig.format : png # png, ps, pdf, svg -#savefig.bbox : standard # 'tight' or 'standard'. 'tight' is incompatible with - # pipe-based animation backends but will work with - # temporary file based ones: e.g. setting - # animation.writer to ffmpeg will not work, +#savefig.bbox : standard # 'tight' or 'standard' + # 'tight' is incompatible with pipe-based animation + # backends but will work with temporary file based ones: + # e.g. setting animation.writer to ffmpeg will not work, # use ffmpeg_file instead #savefig.pad_inches : 0.1 # Padding to be used when bbox is set to 'tight' #savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality parameter.