* commit '35177ba7':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>