[FFmpeg-cvslog] Merge commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72'

[James Almer]

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

Merge commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72'

* commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72':
  Don't use expressions with side effects in macro parameters

This commit is a noop. It would be reverted in a future merge either
way.

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

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