matplotlib
diff --git a/‎lib/matplotlib/animation.py
Lines changed: 23 additions & 11 deletions b/‎lib/matplotlib/animation.py
Lines changed: 23 additions & 11 deletions
@@ -424,7 +424,7 @@ def __init__(self, *args, **kwargs):
         self.frame_format = rcParams['animation.frame_format']
 
     def setup(self, fig, outfile, dpi=None, frame_prefix='_tmp',
-              clear_temp=True):
+              clear_temp=True, frame_dir=None):
         '''Perform setup for writing the movie file.
 
         Parameters
@@ -444,17 +444,24 @@ def setup(self, fig, outfile, dpi=None, frame_prefix='_tmp',
             If the temporary files should be deleted after stitching
             the final result.  Setting this to ``False`` can be useful for
             debugging.  Defaults to ``True``.
-
+        frame_dir : str or None, optional
+            Directory where the temporary files are saved. None means the
+            default and '' means no temporary directory.
         '''
         self.fig = fig
         self.outfile = outfile
         if dpi is None:
             dpi = self.fig.dpi
         self.dpi = dpi
         self._adjust_frame_size()
+        root, _ = os.path.splitext(outfile)
+        if frame_dir is None:
+            frame_dir = '_' + root + '_frames'
+        if not os.path.exists(frame_dir) and frame_dir is not '':
+            os.makedirs(frame_dir)
+        self.temp_prefix = os.path.join(frame_dir, frame_prefix)
         self.clear_temp = clear_temp
-        self.temp_prefix = frame_prefix
         self._frame_counter = 0  # used for generating sequential file names
         self._temp_names = list()
         self.fname_format_str = '%s%%07d.%s'
@@ -542,6 +549,9 @@ def cleanup(self):
                        self._temp_names)
             for fname in self._temp_names:
                 os.remove(fname)
+            folder = os.path.split(fname)[0]
+            if folder is not '':
+                os.rmdir(folder)
 
 
 @writers.register('pillow')
@@ -597,7 +607,10 @@ class FFMpegBase(object):
 
     @property
     def output_args(self):
-        args = ['-vcodec', self.codec]
+        if self.codec is not '':
+            args = ['-vcodec', self.codec]
+        else:
+            args = []
         # For h264, the default format is yuv444p, which is not compatible
         # with quicktime (and others). Specifying yuv420p fixes playback on
         # iOS,as well as HTML5 video in firefox and safari (on both Win and
@@ -665,8 +678,7 @@ 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(), '-r', str(self.fps),
-                '-i', self._base_temp_name(),
-                '-vframes', str(self._frame_counter)] + self.output_args
+                '-i', self._base_temp_name()] + self.output_args
 
 
 # Base class of avconv information.  AVConv has identical arguments to FFMpeg.
@@ -855,13 +867,13 @@ def setup(self, fig, outfile, dpi, frame_dir=None):
         if not self.embed_frames:
             if frame_dir is None:
                 frame_dir = root + '_frames'
-            if not os.path.exists(frame_dir):
-                os.makedirs(frame_dir)
-            frame_prefix = os.path.join(frame_dir, 'frame')
+            frame_prefix = 'frame'
         else:
-            frame_prefix = None
+            frame_dir = ''
+            frame_prefix = 'None'
 
-        super().setup(fig, outfile, dpi, frame_prefix, clear_temp=False)
+        super().setup(fig, outfile, dpi, frame_prefix, clear_temp=False,
+                      frame_dir=frame_dir)
 
     def grab_frame(self, **savefig_kwargs):
         if self.embed_frames: