[FFmpeg-cvslog] Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 22 19:40:29 2016 +0200| [1c85027afe8dedb1b2940a01da74c09b932df6e7] | committer: Clément Bœsch

Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'

* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
  x86inc: Improve handling of %ifid with multi-token parameters

This commit is a noop, see 4bd5583acea5d65a2f8fd8fcd5ab7b404af23f45

Merged-by: Clément Bœsch <u at pkh.me>

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