eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'

Browse Source 
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
  hwcontext: add a QSV implementation

Conflicts:
    doc/APIchanges
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2016-09-28 13:30:27 -03:00
parent e9a5fc9678 59e7361cc7
commit eba0414768
8 changed files with 857 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavutil/hwcontext_internal.h
View File

@@ -101,6 +101,7 @@ struct AVHWFramesInternal {
extern const HWContextType ff_hwcontext_type_cuda;
extern const HWContextType ff_hwcontext_type_dxva2;
extern const HWContextType ff_hwcontext_type_qsv;
extern const HWContextType ff_hwcontext_type_vaapi;
extern const HWContextType ff_hwcontext_type_vdpau;