Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:16:27 +0000 (11:16 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:16:27 +0000 (11:16 +0200)
* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2':
  cosmetics: Drop spurious spaces from if clauses

Conflicts:
libavcodec/vc1_block.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/vc1_block.c

Simple merge