[FFmpeg-cvslog] Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 15:37:11 2013 +0100| [60cc4a32b52fef453d03b3c60e1d661e3fad9c05] | committer: Michael Niedermayer

Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'

* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
	configure

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

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