Merge pull request matplotlib#4005 from dopplershift/mencoder-tests

TST : Try to fix mencoder tests
Conflicts:
	.travis.yml

cherry-pick tried to pull over too many changes in travis.yaml

Author: tacaswell

.travis.yml

@@ -22,8 +22,8 @@ matrix:
 
 install:
   - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
-  - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools
-  # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need 
+  - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools mencoder
+  # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need
   - if [[ $BUILD_DOCS == true ]]; then sudo apt-get install -qq --no-install-recommends dvipng texlive-latex-base texlive-latex-extra texlive-fonts-recommended graphviz; fi
   - if [[ $BUILD_DOCS == true ]]; then pip install sphinx numpydoc linkchecker; fi
   - python setup.py install

lib/matplotlib/tests/test_animation.py

@@ -33,9 +33,6 @@ def check_save_animation(writer, extension='mp4'):
     if not animation.writers.is_available(writer):
         raise KnownFailureTest("writer '%s' not available on this system"
                                % writer)
-    if 'mencoder' in writer:
-        raise KnownFailureTest("mencoder is broken")
-
     fig, ax = plt.subplots()
     line, = ax.plot([], [])
 
@@ -57,7 +54,7 @@ def animate(i):
     F.close()
     anim = animation.FuncAnimation(fig, animate, init_func=init, frames=5)
     try:
-        anim.save(F.name, fps=30, writer=writer)
+        anim.save(F.name, fps=30, writer=writer, bitrate=500)
     except UnicodeDecodeError:
         raise KnownFailureTest("There can be errors in the numpy " +
                                "import stack, " +