Michael Niedermayer 21c7e99659 Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' ...

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

Conflicts:
	Makefile
	configure

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

2014-04-29 01:47:53 +02:00

117 KiB

Raw Blame History

View Raw