Merge commit '899ee03088d55152a48830df0899887f055da1de'

* commit '899ee03088d55152a48830df0899887f055da1de':
  Unbreak travis on macos

Merged-by: James Almer <jamrial@gmail.com>

diff --cc .travis.yml
index 63f2051cb3f1f22e2529e61ad682c00b3a9a731a,3cfcb40c3ac42edd37c26637c594566648eaab2a..784b7bdf73d8c6d86e5b09b856648008de203588
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -17,9 -17,9 +17,9 @@@ matrix
            compiler: gcc
  cache:
    directories:
 -    - libav-samples
 +    - ffmpeg-samples
  before_install:
-   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
  install:
    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
  script: