[FFmpeg-cvslog] Merge commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 21:33:13 2017 -0300| [86fb169df5895cc72835d6edd9b9c987f0bcf130] | committer: James Almer

Merge commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d'

* commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d':
  Revert "Don't use expressions with side effects in macro parameters"

This commit is a noop.

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

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