[FFmpeg-cvslog] Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 19:46:01 2016 +0100| [d97a61a8f132e749f5b808300e126f9c0c3acfa1] | committer: Derek Buitenhuis

Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'

This commit is a no-op.

* commit 'a84713e70d06238100cb0f867ad6031c272054b0':
  parseutils-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=d97a61a8f132e749f5b808300e126f9c0c3acfa1
---