Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

Browse Source

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

Conflicts:
	Makefile

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

pull/68/head

Michael Niedermayer 11 years ago

parent 2856332719 1839fafa95

commit 5460ab73d2

5 changed files with 143 additions and 0 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save