diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 00:43:52 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 00:43:52 +0300 |
| commit | b975aeec02e4518a4e5f2996cf51d113e42e1727 (patch) | |
| tree | 2a2db1597eb4a20f4ad9f7be56d3992bbcfb8448 /libavcodec/allcodecs.c | |
| parent | 508957fd0fc398271f3ec87cde63ba4533678bf9 (diff) | |
| parent | 2c62fcdf5d617791a653d7957d449f75569eede0 (diff) | |
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
lavc: VAAPI H.264 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index fe882de71a..4bceac6dd6 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -196,6 +196,7 @@ void avcodec_register_all(void) #if FF_API_VDPAU REGISTER_DECODER(H264_VDPAU, h264_vdpau); #endif + REGISTER_ENCODER(H264_VAAPI, h264_vaapi); REGISTER_ENCDEC (HAP, hap); REGISTER_DECODER(HEVC, hevc); REGISTER_DECODER(HEVC_QSV, hevc_qsv); |