* commit 'a61c2115':
  configure: rework dxva in avconv handling

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