[FFmpeg-cvslog] Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 01:32:04 2014 +0200| [21c7e99659bea1ed735caa83399a5777957a8e16] | committer: Michael Niedermayer

Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

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

Conflicts:
	Makefile
	configure

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

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