diff options
| author | Matthew <[email protected]> | 2017-09-30 08:10:35 -0400 |
|---|---|---|
| committer | Matthew <[email protected]> | 2017-09-30 08:10:35 -0400 |
| commit | 0dbe9a589e614c74305ebfbde9fc0d66dd515c2b (patch) | |
| tree | 443099520802699b8e4b0bb220d1effd5a2b4b5e | |
| parent | b8b303a05b65135ca4836f6070d89ad6218cba9c (diff) | |
updated module.defs to remove hwaccel
| -rw-r--r-- | contrib/ffmpeg/module.defs | 1 | ||||
| -rw-r--r-- | libhb/work.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index ae9485816..904d75f3e 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -30,7 +30,6 @@ FFMPEG.CONFIGURE.extra = \ --disable-avdevice \ --disable-muxers \ --disable-network \ - --disable-hwaccels \ --disable-vaapi \ --disable-vdpau \ --disable-encoders \ diff --git a/libhb/work.c b/libhb/work.c index 9f517941d..bce29a92a 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -227,9 +227,8 @@ hb_work_object_t* hb_video_encoder(hb_handle_t *h, int vcodec) case HB_VCODEC_X264_10BIT: w = hb_get_work(h, WORK_ENCX264); break; - case HB_VCODEC_QSV_H264: - case HB_VCODEC_H264_NVENC: - case HB_VCODEC_HEVC_NVENC: + case HB_VCODEC_H264_NVENC: + case HB_VCODEC_QSV_H264: case HB_VCODEC_QSV_H265: case HB_VCODEC_QSV_H265_10BIT: w = hb_get_work(h, WORK_ENCQSV); @@ -238,12 +237,13 @@ hb_work_object_t* hb_video_encoder(hb_handle_t *h, int vcodec) w = hb_get_work(h, WORK_ENCTHEORA); break; #ifdef USE_X265 + case HB_VCODEC_HEVC_NVENC: case HB_VCODEC_X265_8BIT: case HB_VCODEC_X265_10BIT: case HB_VCODEC_X265_12BIT: case HB_VCODEC_X265_16BIT: w = hb_get_work(h, WORK_ENCX265); - break; + break; #endif default: hb_error("Unknown video codec (0x%x)", vcodec ); |