[FFmpeg-cvslog] Merge commit '78670fbf07bd03479073d4218440de4914304680'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 22 12:54:56 2014 +0200| [4ec1cb24978e201062408ffebad18d8ef906a46d] | committer: Michael Niedermayer

Merge commit '78670fbf07bd03479073d4218440de4914304680'

* commit '78670fbf07bd03479073d4218440de4914304680':
  imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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