diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:30:27 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:30:27 -0300 |
| commit | eba041476879fc46a49fa36fca03f1565ecaefca (patch) | |
| tree | 937fd074b99894eb3f1c9ec096c8e74bbe12f946 /libavutil/parseutils.c | |
| parent | e9a5fc967867f9bd361f472306ca130bb64b0b04 (diff) | |
| parent | 59e7361cc791e5103be1712dc59a2055f118d0da (diff) | |
| download | ffmpeg-eba041476879fc46a49fa36fca03f1565ecaefca.tar.gz | |
Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
hwcontext: add a QSV implementation
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions