[FFmpeg-cvslog] Merge commit '5aed1d4240d411533c102eec6944aa925b7f4964'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 26 01:20:08 2015 +0200| [fa2d3b6dbe0ed507ae3d19038f9a46e8e9a72b70] | committer: Michael Niedermayer

Merge commit '5aed1d4240d411533c102eec6944aa925b7f4964'

* commit '5aed1d4240d411533c102eec6944aa925b7f4964':
  vaapi: Fix -Wimplicit-function-declaration for ff_dlog() usage

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

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