diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.c | 2 | ||||
| -rw-r--r-- | libhb/decavcodec.c | 2 | ||||
| -rw-r--r-- | libhb/decpgssub.c | 2 | ||||
| -rw-r--r-- | libhb/encavcodecaudio.c | 4 | ||||
| -rw-r--r-- | libhb/hbffmpeg.c | 2 | ||||
| -rw-r--r-- | libhb/module.defs | 4 | ||||
| -rw-r--r-- | libhb/qsv_filter.c | 4 | ||||
| -rw-r--r-- | libhb/stream.c | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/libhb/common.c b/libhb/common.c index 0b23fda60..8d56248bf 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -348,7 +348,7 @@ static int hb_audio_encoder_is_enabled(int encoder) return 1; #endif -#ifdef USE_LIBAV_AAC +#ifdef USE_FFMPEG_AAC case HB_ACODEC_FFAAC: return avcodec_find_encoder_by_name("aac") != NULL; #endif diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 3e444413d..dd044f3a8 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -377,7 +377,7 @@ static void closePrivData( hb_work_private_t ** ppv ) /* * FIXME: knowingly leaked. * - * If we're using our Libav QSV wrapper, qsv_decode_end() will call + * If we're using our FFmpeg QSV wrapper, qsv_decode_end() will call * MFXClose() on the QSV session. Even if decoding is complete, we * still need that session for QSV filtering and/or encoding, so we * we can't close the context here until we implement a proper fix. diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c index acb0e1dde..8e6532532 100644 --- a/libhb/decpgssub.c +++ b/libhb/decpgssub.c @@ -227,7 +227,7 @@ static int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in, } /* Subtitles are "usable" if: - * 1. Libav returned a subtitle (has_subtitle) AND + * 1. FFmpeg returned a subtitle (has_subtitle) AND * 2. we're not doing Foreign Audio Search (!pv->job->indepth_scan) AND * 3. the sub is non-empty or we've seen one such sub before (!pv->discard_subtitle) * For forced-only extraction, usable subtitles also need to: diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c index d3c1fe5d1..c129c07d7 100644 --- a/libhb/encavcodecaudio.c +++ b/libhb/encavcodecaudio.c @@ -97,7 +97,7 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job) profile = FF_PROFILE_AAC_LOW; break; } - // Libav's libfdk-aac wrapper expects back channels for 5.1 + // FFmpeg's libfdk-aac wrapper expects back channels for 5.1 // audio, and will error out unless we translate the layout if (channel_layout == AV_CH_LAYOUT_5POINT1) channel_layout = AV_CH_LAYOUT_5POINT1_BACK; @@ -130,7 +130,7 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job) case HB_ACODEC_OPUS: codec_name = "libopus"; - // Libav's libopus wrapper expects back channels for 5.1 + // FFmpeg's libopus wrapper expects back channels for 5.1 // audio, and will error out unless we translate the layout if (channel_layout == AV_CH_LAYOUT_5POINT1) channel_layout = AV_CH_LAYOUT_5POINT1_BACK; diff --git a/libhb/hbffmpeg.c b/libhb/hbffmpeg.c index 0b3403ed7..5b0a7c24d 100644 --- a/libhb/hbffmpeg.c +++ b/libhb/hbffmpeg.c @@ -160,7 +160,7 @@ int hb_ff_get_colorspace(int color_matrix) case HB_COLR_MAT_BT709: color_space = SWS_CS_ITU709; break; - /* enable this when implemented in Libav + /* enable this when implemented in FFmpeg case HB_COLR_MAT_BT2020: color_space = SWS_CS_BT2020; break; diff --git a/libhb/module.defs b/libhb/module.defs index cded5806d..99e2b4cfa 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -42,8 +42,8 @@ LIBHB.out += $(LIBHB.a) ############################################################################### -ifeq (1,$(FEATURE.libav_aac)) -LIBHB.GCC.D += USE_LIBAV_AAC +ifeq (1,$(FEATURE.ffmpeg_aac)) +LIBHB.GCC.D += USE_FFMPEG_AAC endif LIBHB.GCC.D += __LIBHB__ USE_PTHREAD LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include diff --git a/libhb/qsv_filter.c b/libhb/qsv_filter.c index 5daa69b0e..9f7450c7e 100644 --- a/libhb/qsv_filter.c +++ b/libhb/qsv_filter.c @@ -160,11 +160,11 @@ static int filter_init( hb_qsv_context* qsv, hb_filter_private_t * pv ){ /* * In theory, input width/height and decode CropW/CropH should be the - * same; however, due to some versions of Libav not applying the H.264 + * same; however, due to some versions of FFmpeg not applying the H.264 * "crop rect" properly, there can be a mismatch. * * Since we want the same bahevior regardless of whether we're using - * software or hardware-accelerated decoding, prefer the Libav values. + * software or hardware-accelerated decoding, prefer the FFmpeg values. * * Note that since CropW/CropH may be higher than the decode values, we * need to adjust CropX/CropY to make sure we don't exceed the input's diff --git a/libhb/stream.c b/libhb/stream.c index ba9a17835..d7cd899da 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -4191,7 +4191,7 @@ static void hb_ts_resolve_pid_types(hb_stream_t *stream) continue; } // 0xa2 is DTS-HD LBR used in HD-DVD and bluray for - // secondary audio streams. Libav can not decode yet. + // secondary audio streams. FFmpeg can not decode yet. // Having it in the audio list causes delays during scan // while we try to get stream parameters. So skip // this type for now. @@ -5403,7 +5403,7 @@ static void add_ffmpeg_attachment( hb_title_t *title, hb_stream_t *stream, int i switch ( codecpar->codec_id ) { case AV_CODEC_ID_TTF: - // Libav sets codec ID based on mime type of the attachment + // FFmpeg sets codec ID based on mime type of the attachment type = FONT_TTF_ATTACH; break; default: |