From 9547df139747c8ee72b86ea9a76166cd124f04e2 Mon Sep 17 00:00:00 2001 From: Norbert Schlia Date: Sat, 13 Jan 2024 22:09:03 +0100 Subject: [PATCH] Closes #153: added description for --include_extensions parameter --- NEWS | 2 ++ README.md | 1 + ffmpegfs.1.txt | 12 +++++++++++- src/ffmpeg_transcoder.cc | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 98000cdf..93cada97 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,8 @@ Important changes in 2.15 (2023-12-XX): * Issue #149: 2021-09-20 - dd846bc4a91 - lavc 59.8.100 - avcodec.h codec.h Deprecate AV_CODEC_FLAG_TRUNCATED and AV_CODEC_CAP_TRUNCATED, as they are redundant with parsers. +* Closes #153: The --include_extensions parameter now contains a description, + which was previously missing from the manual and online help. Important changes in 2.14 (2023-06-15): diff --git a/README.md b/README.md index d74c2b0f..970d71e2 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ To see what's been done so far, checkout the [windows](https://github.com/nschli Add AV_FRAME_FLAG_INTERLACED, AV_FRAME_FLAG_TOP_FIELD_FIRST, and AV_FRAME_FLAG_KEY flags as replacement. - Issue [#149](https://github.com/nschlia/ffmpegfs/issues/149): 2021-09-20 - dd846bc4a91 - lavc 59.8.100 - avcodec.h codec.h Deprecate AV_CODEC_FLAG_TRUNCATED and AV_CODEC_CAP_TRUNCATED, as they are redundant with parsers. +- **Bugfix:** Closes [#153](https://github.com/nschlia/ffmpegfs/issues/153): The --include_extensions parameter now contains a description, which was previously missing from the manual and online help. **New in in 2.14 (2023-06-15):** diff --git a/ffmpegfs.1.txt b/ffmpegfs.1.txt index e8dd26b8..dd2867dc 100644 --- a/ffmpegfs.1.txt +++ b/ffmpegfs.1.txt @@ -159,8 +159,18 @@ Set level for output if available. 'NAME' can be: + Defaults to: *HQ* +*--include_extensions*=LIST, *-oinclude_extensions*=LIST:: +Set the list of file extensions to be encoded. 'LIST' can have one or more entries that are separated by commas. These are the only file extensions that will be transcoded. +Can be specified numerous times and will be merged, which is required when specifying them in the fstab because commas cannot be used to separate the extensions. +The entries support shell wildcard patterns. ++ +Example: --include_extensions=mp4,wmv to encode MPEG-4 and Windows Media files only. ++ +Defaults to: Encode all supported files. + *--hide_extensions*=LIST, *-ohide_extensions*=LIST:: -Set a list of file extensions that should be hidden from the output. 'LIST' can contain one or more entries, separated by commas. +Set a list of file extensions to exclude from the output. 'LIST' can have one or more entries that are separated by commas. +Can be specified numerous times and will be merged, which is required when specifying them in the fstab because commas cannot be used to separate the extensions. The entries support shell wildcard patterns. + Example: --hide_extensions=jpg,png,cue to stop covers and cue sheets from showing up. diff --git a/src/ffmpeg_transcoder.cc b/src/ffmpeg_transcoder.cc index fc6ef660..ec8c4696 100644 --- a/src/ffmpeg_transcoder.cc +++ b/src/ffmpeg_transcoder.cc @@ -2000,7 +2000,7 @@ int FFmpeg_Transcoder::add_stream(AVCodecID codec_id) // Logging::error(virtname(), "Could not set 'qp' for %1 output codec %2 (error '%3').", get_media_type_string(output_codec->type), get_codec_name(codec_id, false), ffmpeg_geterror(ret).c_str()); // return ret; //} - output_codec_ctx->global_quality = 34; + output_codec_ctx->global_quality = 34; } // Avoid mismatches for H264 and profile