diff options
| author | Bradley Sepos <[email protected]> | 2018-06-08 16:33:23 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-08 16:34:52 -0400 |
| commit | 6f139b1aed86379258c9232c24c268d3d0a5c406 (patch) | |
| tree | e5c3449e23df77bc22450891a10ce83e2ef1d6b1 /libhb | |
| parent | c3220c073d31c6dd0345f8ee37fe84806219975a (diff) | |
libhb: test: Guard VCE encoders behind USE_VCE.
Fixes #1403.
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.c | 4 | ||||
| -rw-r--r-- | libhb/module.defs | 4 | ||||
| -rw-r--r-- | libhb/work.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libhb/common.c b/libhb/common.c index 9c1c42f32..a55244427 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -267,9 +267,13 @@ static int hb_video_encoder_is_enabled(int encoder) case HB_VCODEC_FFMPEG_MPEG2: case HB_VCODEC_FFMPEG_VP8: case HB_VCODEC_FFMPEG_VP9: + return 1; + +#ifdef USE_VCE case HB_VCODEC_FFMPEG_VCE_H264: case HB_VCODEC_FFMPEG_VCE_H265: return 1; +#endif #ifdef USE_X265 case HB_VCODEC_X265_8BIT: diff --git a/libhb/module.defs b/libhb/module.defs index 99e2b4cfa..6afb6f403 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -82,6 +82,10 @@ ifeq (1,$(FEATURE.qsv)) LIBHB.GCC.D += USE_QSV HAVE_THREADS=1 endif +ifeq (1,$(FEATURE.vce)) + LIBHB.GCC.D += USE_VCE +endif + ifeq (1,$(FEATURE.x265)) LIBHB.GCC.D += USE_X265 endif diff --git a/libhb/work.c b/libhb/work.c index 19d78b2e4..1400fee1f 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -243,6 +243,7 @@ hb_work_object_t* hb_video_encoder(hb_handle_t *h, int vcodec) w = hb_get_work(h, WORK_ENCX265); break; #endif +#ifdef USE_VCE case HB_VCODEC_FFMPEG_VCE_H264: w = hb_get_work(h, WORK_ENCAVCODEC); w->codec_param = AV_CODEC_ID_H264; @@ -251,6 +252,7 @@ hb_work_object_t* hb_video_encoder(hb_handle_t *h, int vcodec) w = hb_get_work(h, WORK_ENCAVCODEC); w->codec_param = AV_CODEC_ID_HEVC; break; +#endif default: hb_error("Unknown video codec (0x%x)", vcodec ); } |