[FFmpeg-cvslog] Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Aug 27 09:53:07 2015 +0200| [f5258a7d16d01ddce0913b110a5d407d460c3906] | committer: Hendrik Leppkes

Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'

* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
  webm: Explicitly select libvpx, libopus and libvorbis encoders

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5258a7d16d01ddce0913b110a5d407d460c3906
---