[FFmpeg-cvslog] Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep  4 19:10:28 2014 +0200| [a52e74db17e56a49464d36c9168f5fea5ce2be02] | committer: Michael Niedermayer

Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8'

* commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8':
  fdctdsp: cosmetics: Drop one unnecessary if-block level

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

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