diff options
| author | matthew <[email protected]> | 2017-10-02 20:06:44 -0400 |
|---|---|---|
| committer | matthew <[email protected]> | 2017-10-02 20:06:44 -0400 |
| commit | 3aa9386b42c503ecf340cdb24f6306dcb2a29e40 (patch) | |
| tree | eb7769b5eaa2a67d2a70213d535e2989172d7605 | |
| parent | 5cf0d051e2ea830cef85db03a4d9a8ad1de1ad0f (diff) | |
added entries to muxavformat and work files
| -rw-r--r-- | libhb/muxavformat.c | 2 | ||||
| -rw-r--r-- | libhb/work.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c index f628b9628..c4a37a748 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -214,6 +214,7 @@ static int avformatInit( hb_mux_object_t * m ) case HB_VCODEC_X264_8BIT: case HB_VCODEC_X264_10BIT: case HB_VCODEC_QSV_H264: + case HB_VCODEC_H264_NVENC: track->st->codecpar->codec_id = AV_CODEC_ID_H264; /* Taken from x264 muxers.c */ @@ -331,6 +332,7 @@ static int avformatInit( hb_mux_object_t * m ) case HB_VCODEC_X265_16BIT: case HB_VCODEC_QSV_H265: case HB_VCODEC_QSV_H265_10BIT: + case HB_VCODEC_HEVC_NVENC: track->st->codecpar->codec_id = AV_CODEC_ID_HEVC; track->st->codecpar->codec_tag = MKTAG('h','v','c','1'); diff --git a/libhb/work.c b/libhb/work.c index bce29a92a..cf0df4fc8 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -227,21 +227,21 @@ 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_H264_NVENC: case HB_VCODEC_QSV_H264: case HB_VCODEC_QSV_H265: case HB_VCODEC_QSV_H265_10BIT: + case HB_VCODEC_H264_NVENC: w = hb_get_work(h, WORK_ENCQSV); break; case HB_VCODEC_THEORA: 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: + case HB_VCODEC_HEVC_NVENC: w = hb_get_work(h, WORK_ENCX265); break; #endif |