Michael Niedermayer 5460ab73d2 Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' ...

* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile

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

2014-05-12 02:44:28 +02:00

3.9 KiB

Raw Blame History

View Raw