[FFmpeg-cvslog] Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct  3 21:28:07 2017 -0300| [a2b0602cdad8da62c137f7db07b608d6bbbcefaa] | committer: James Almer

Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'

* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
  Use modern avconv syntax for codec selection in documentation and tests

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

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

 doc/encoders.texi            |  2 +-
 doc/faq.texi                 |  8 +++----
 doc/filters.texi             |  2 +-
 doc/indevs.texi              |  6 ++---
 doc/outdevs.texi             |  6 ++---
 tests/fate/demux.mak         | 54 ++++++++++++++++++++++----------------------
 tests/fate/ffmpeg.mak        |  2 +-
 tests/fate/filter-audio.mak  |  2 +-
 tests/fate/h264.mak          |  2 +-
 tests/fate/hevc.mak          |  2 +-
 tests/fate/libswresample.mak | 18 +++++++--------
 tests/fate/microsoft.mak     |  2 +-
 tests/fate/mp3.mak           | 14 ++++++------
 tests/fate/mpc.mak           |  4 ++--
 tests/fate/mxf.mak           |  6 ++---
 tests/fate/prores.mak        |  2 +-
 tests/fate/utvideo.mak       |  2 +-
 tests/fate/vcodec.mak        | 26 ++++++++++-----------
 tests/fate/video.mak         |  6 ++---
 tests/fate/vpx.mak           |  2 +-
 tests/fate/vqf.mak           |  2 +-
 21 files changed, 85 insertions(+), 85 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commitdiff;h=a2b0602cdad8da62c137f7db07b608d6bbbcefaa