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)
commite1def4ffec209c0949807f8c505539dc6d709c31
treef0e4d809b96fe7c20c14afc8415815a2dcb6e9f1
parentb1d547fe024a3ba223e4d0d7f73617b71d629827
parent1542ec96389f32e5081c6c607e4b6f5e257ccdf2
Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'

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

Conflicts:
libavcodec/vc1_block.c

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