[FFmpeg-cvslog] Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri May  5 13:53:11 2017 +0200| [b010843594fee88a791185b83684e0e725007b7b] | committer: Clément Bœsch

Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'

* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1':
  Replace cmdutils_common_opts.h by a macro

Merged-by: Clément Bœsch <cboesch at gopro.com>

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

 Makefile               |  3 +--
 cmdutils.h             | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 cmdutils_common_opts.h | 37 -----------------------------------
 ffmpeg_opt.c           |  2 +-
 ffplay.c               |  2 +-
 ffprobe.c              |  2 +-
 ffserver.c             |  2 +-
 tests/ref/fate/source  |  2 --
 8 files changed, 58 insertions(+), 45 deletions(-)

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