[FFmpeg-cvslog] Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 18 15:00:13 2016 +0100| [1be5509fbbc6d1675074ca58a546eba26c63ec74] | committer: Derek Buitenhuis

Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'

These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.

* commit '0d2fcdb1c5c9e844c232e5429130727121990d0e':
  opt-test: Merge struct declaration and initialization
  opt-test: Move some variable declarations to avoid block braces

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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