Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 10:37:44 +0000 (11:37 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 10:40:35 +0000 (11:40 +0100)
commit71d541751ef10255ec8b179b014246e69a9c060b
tree91471868e9c4339f46aaecc9a8d74ce5ebe038c5
parent30ac66abf0995c3a9a6c5370d357e51268b1b69f
parent043b0b9fb1481053b712d06d2c5b772f1845b72b
Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'

* commit '043b0b9fb1481053b712d06d2c5b772f1845b72b':
  Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v

The merge also includes all our own occurences.

Merged-by: Clément Bœsch <u@pkh.me>
doc/ffmpeg.texi
tests/fate/demux.mak
tests/fate/ffmpeg.mak
tests/fate/fifo-muxer.mak
tests/fate/filter-audio.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/pcm.mak
tests/fate/real.mak
tests/fate/video.mak