Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'
authorJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 00:28:07 +0000 (21:28 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 00:28:07 +0000 (21:28 -0300)
commita2b0602cdad8da62c137f7db07b608d6bbbcefaa
tree67220614b5797dc9bd6ea58244a1a2e1e2e3197b
parent08c751309670854c73b58f234a83f4ba679370be
parent4141a5a240fba44b4b4a1c488c279d7dd8a11ec7
Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'

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

Merged-by: James Almer <jamrial@gmail.com>
20 files changed:
doc/encoders.texi
doc/faq.texi
doc/filters.texi
doc/indevs.texi
doc/outdevs.texi
tests/fate/demux.mak
tests/fate/ffmpeg.mak
tests/fate/filter-audio.mak
tests/fate/h264.mak
tests/fate/hevc.mak
tests/fate/libswresample.mak
tests/fate/microsoft.mak
tests/fate/mp3.mak
tests/fate/mxf.mak
tests/fate/prores.mak
tests/fate/utvideo.mak
tests/fate/vcodec.mak
tests/fate/video.mak
tests/fate/vpx.mak
tests/fate/vqf.mak