[FFmpeg-cvslog] Merge commit '9ef748173a4e0e58d40afaf38397783cd2537eaa'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct 16 22:57:21 2015 +0200| [93ac7a98e022a5566822dfb1ad13541690aeea3d] | committer: Hendrik Leppkes

Merge commit '9ef748173a4e0e58d40afaf38397783cd2537eaa'

* commit '9ef748173a4e0e58d40afaf38397783cd2537eaa':
  cmdutils: Print general codec capabilities

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

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