diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 16:18:02 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 16:18:02 +0200 |
| commit | dd8a4b0f8c39803b6a33f4b4bc836cfc66222370 (patch) | |
| tree | 32fb5e4b29968caef33ecd449d25288604556dfc /ffmpeg.h | |
| parent | 866a4174dba066780c7be1ebdaa0152161cdf3e0 (diff) | |
| parent | fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8 (diff) | |
| download | ffmpeg-streaming-dd8a4b0f8c39803b6a33f4b4bc836cfc66222370.zip ffmpeg-streaming-dd8a4b0f8c39803b6a33f4b4bc836cfc66222370.tar.gz | |
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
avconv: add support for Intel QSV-accelerated transcoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg.h')
| -rw-r--r-- | ffmpeg.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -64,6 +64,7 @@ enum HWAccelID { HWACCEL_DXVA2, HWACCEL_VDA, HWACCEL_VIDEOTOOLBOX, + HWACCEL_QSV, }; typedef struct HWAccel { @@ -414,6 +415,8 @@ typedef struct OutputStream { int last_droped; int last_nb0_frames[3]; + void *hwaccel_ctx; + /* video only */ AVRational frame_rate; int force_fps; @@ -567,5 +570,7 @@ int vdpau_init(AVCodecContext *s); int dxva2_init(AVCodecContext *s); int vda_init(AVCodecContext *s); int videotoolbox_init(AVCodecContext *s); +int qsv_init(AVCodecContext *s); +int qsv_transcode_init(OutputStream *ost); #endif /* FFMPEG_H */ |
