Michael Niedermayer c6eee3120a Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' ...

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

Conflicts:
	Makefile
	configure

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

2014-04-29 01:22:22 +02:00

15 KiB

Raw Blame History

View Raw