[FFmpeg-cvslog] Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 15:45:45 2013 +0100| [8cf9253aef19e0ef4523be253a8fa8853179cfb0] | committer: Michael Niedermayer

Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'

* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
	configure

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

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