Commit graph

1 commit

Author SHA1 Message Date
Michael Niedermayer
5460ab73d2 Merge commit '1839fafa95'
* commit '1839fafa95':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +02:00