Merge branch 'simplify-figsize-adjust' of github.com:ngoldbaum/matplotlib into simplify-figsize-adjust

Nathan Goldbaum · Nathan Goldbaum · commit 2341c617d6bf · 2017-03-13T11:41:17.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ addons:
     packages:
       - inkscape
       - libav-tools
+      - libavcodec-extra-53
       - gdb
       - mencoder
       - dvipng
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -130,7 +130,6 @@ def isAvailable(self):
 # matplotlib.testing.image_comparison
 @pytest.mark.parametrize('writer, extension', WRITER_OUTPUT)
 def test_save_animation_smoketest(tmpdir, writer, extension):
-    mpl.rcParams['animation.codec'] = 'h264'
     try:
         # for ImageMagick the rcparams must be patched to account for
         # 'convert' being a built in MS tool, not the imagemagick
@@ -147,10 +146,12 @@ def test_save_animation_smoketest(tmpdir, writer, extension):
     ax.set_ylim(-1, 1)
 
     dpi = None
+    codec = None
     if writer == 'ffmpeg':
         # Issue #8253
         fig.set_size_inches((10.85, 9.2000000000000011))
         dpi = 100.
+        codec = 'h264'
 
     def init():
         line.set_data([], [])
@@ -168,7 +169,7 @@ def animate(i):
         anim = animation.FuncAnimation(fig, animate, init_func=init, frames=5)
         try:
             anim.save('movie.' + extension, fps=30, writer=writer, bitrate=500,
-                      dpi=dpi)
+                      dpi=dpi, codec=codec)
         except UnicodeDecodeError:
             pytest.xfail("There can be errors in the numpy import stack, "
                          "see issues #1891 and #2679")
