diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:34:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:44:28 +0200 |
| commit | 5460ab73d2e8169c54beda06e7cca762aee84a1f (patch) | |
| tree | 8c50adb34c4df34a90cba7bc14edc84fe8bd4f13 /doc/authors.texi | |
| parent | 2856332719d8ec182523f7793bb0517aaac68e73 (diff) | |
| parent | 1839fafa951308237c4672ffd9a94f927b26eac7 (diff) | |
| download | ffmpeg-5460ab73d2e8169c54beda06e7cca762aee84a1f.tar.gz | |
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/authors.texi')
0 files changed, 0 insertions, 0 deletions