[FFmpeg-cvslog] Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Aug 10 11:16:27 2015 +0200| [e1def4ffec209c0949807f8c505539dc6d709c31] | committer: Hendrik Leppkes

Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'

* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2':
  cosmetics: Drop spurious spaces from if clauses

Conflicts:
	libavcodec/vc1_block.c

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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