[FFmpeg-cvslog] doc/decoders: correctly note an option's default in libaribcaption
ffmpeg | branch: master | zheng qian | Thu Nov 2 00:24:21 2023
+0900| [4dbfb52230c4993e58598386ac79b964589dc00e] | committer: Gyan Doshi
doc/decoders: correctly note an option's default in libaribcaption
The `-caption_encoding` option was reported as having a default value of
'ass', whereas it's actually 'auto'.
Signed-off-by: zheng qian
Signed-off-by: Gyan Doshi
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4dbfb52230c4993e58598386ac79b964589dc00e
---
doc/decoders.texi | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/doc/decoders.texi b/doc/decoders.texi
index eb00e2a9e9..f75364166e 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle text.
@table @samp
@item auto
-Automatically detect text encoding.
+Automatically detect text encoding (default).
@item jis
8bit-char JIS encoding defined in ARIB STD B24.
This encoding used in Japan for ISDB captions.
@@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR 15606-1.
This encoding is used in South America for SBTVD / ISDB-Tb captions.
@end table
-The default is @dfn{ass} as same as @dfn{libaribb24} decoder.
-Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB caption.
-
@item -font @var{font_name[,font_name2,...]}
Specify comma-separated list of font family names to be used for @dfn{bitmap}
or @dfn{ass} type subtitle rendering.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/decoders: correctly note an option's default in libaribcaption
ffmpeg | branch: release/6.1 | zheng qian | Thu Nov 2 00:24:21
2023 +0900| [80daebdfdff48dc5ad7c1a704d885c215168e214] | committer: Gyan Doshi
doc/decoders: correctly note an option's default in libaribcaption
The `-caption_encoding` option was reported as having a default value of
'ass', whereas it's actually 'auto'.
Signed-off-by: zheng qian
Signed-off-by: Gyan Doshi
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80daebdfdff48dc5ad7c1a704d885c215168e214
---
doc/decoders.texi | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/doc/decoders.texi b/doc/decoders.texi
index eb00e2a9e9..f75364166e 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle text.
@table @samp
@item auto
-Automatically detect text encoding.
+Automatically detect text encoding (default).
@item jis
8bit-char JIS encoding defined in ARIB STD B24.
This encoding used in Japan for ISDB captions.
@@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR 15606-1.
This encoding is used in South America for SBTVD / ISDB-Tb captions.
@end table
-The default is @dfn{ass} as same as @dfn{libaribb24} decoder.
-Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB caption.
-
@item -font @var{font_name[,font_name2,...]}
Specify comma-separated list of font family names to be used for @dfn{bitmap}
or @dfn{ass} type subtitle rendering.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata
ffmpeg | branch: master | Andreas Rheinhardt | Mon Oct 30 10:55:36 2023 +0100| [02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc] | committer: Andreas Rheinhardt fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata Fixes ticket #10638 (and should also fix ticket #10482) by restoring the behaviour from before 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f. Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc --- fftools/ffmpeg_mux_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index ab2d1d89e4..63a25a350f 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2182,11 +2182,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, if (ret < 0) return ret; -if (type_in == 'g' || type_out == 'g' || !*outspec) +if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic)) *metadata_global_manual = 1; -if (type_in == 's' || type_out == 's' || !*outspec) +if (type_in == 's' || type_out == 's' || (!*outspec && !ic)) *metadata_streams_manual = 1; -if (type_in == 'c' || type_out == 'c' || !*outspec) +if (type_in == 'c' || type_out == 'c' || (!*outspec && !ic)) *metadata_chapters_manual = 1; /* ic is NULL when just disabling automatic mappings */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] configure: fix _Pragma check.
ffmpeg | branch: master | Reimar Döffinger | Sun Oct
29 18:46:16 2023 +0100| [a31992634f0d3b1ab2d2a6b89440dd0120af5b97] | committer:
Reimar Döffinger
configure: fix _Pragma check.
The test can currently pass when _Pragma is not supported, since
_Pragma might be treated as a implicitly declared function.
This happens e.g. with tinycc.
Extending the check to 2 pragmas both matches the actual use
better and avoids this misdetection.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a31992634f0d3b1ab2d2a6b89440dd0120af5b97
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index fe6cd946c4..7afeebebcd 100755
--- a/configure
+++ b/configure
@@ -5984,7 +5984,7 @@ for restrict_keyword in restrict __restrict__ __restrict
""; do
test_code cc "" "char * $restrict_keyword p" && break
done
-check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored
\"-Wdeprecated-declarations\"")'
+check_cc pragma_deprecated "" '_Pragma("GCC diagnostic push") _Pragma("GCC
diagnostic ignored \"-Wdeprecated-declarations\"")'
# The global variable ensures the bits appear unchanged in the object file.
test_cc
[FFmpeg-cvslog] libavutil/log.c: only include valgrind header when used.
ffmpeg | branch: master | Reimar Döffinger | Sun Oct 29 18:49:11 2023 +0100| [9dd49c8b52c3f6f5a486764fce42ec5d5fac8d16] | committer: Reimar Döffinger libavutil/log.c: only include valgrind header when used. This is cleaner, but it is also a workaround for when the header exists, but cannot be compiled. This will happen when the compiler has no inline asm support. Possibly the configure check should be improved as well. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9dd49c8b52c3f6f5a486764fce42ec5d5fac8d16 --- libavutil/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/log.c b/libavutil/log.c index 5948e50467..2d358b7ab9 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -47,7 +47,7 @@ static AVMutex mutex = AV_MUTEX_INITIALIZER; #define LINE_SZ 1024 -#if HAVE_VALGRIND_VALGRIND_H +#if HAVE_VALGRIND_VALGRIND_H && CONFIG_VALGRIND_BACKTRACE #include /* this is the log level at which valgrind will output a full backtrace */ #define BACKTRACE_LOGLEVEL AV_LOG_ERROR ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] libavutil/aarch64/cpu.c: HWCAPS requires inline asm support.
ffmpeg | branch: master | Reimar Döffinger | Sun Oct
29 18:48:22 2023 +0100| [0ea184fc39b48096713dbdf9c9b39de3a976d6eb] | committer:
Reimar Döffinger
libavutil/aarch64/cpu.c: HWCAPS requires inline asm support.
Fixes compilation with tcc, which does not have aarch64
inline asm support.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ea184fc39b48096713dbdf9c9b39de3a976d6eb
---
libavutil/aarch64/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c
index 2b50c426bc..f27fef3992 100644
--- a/libavutil/aarch64/cpu.c
+++ b/libavutil/aarch64/cpu.c
@@ -31,7 +31,7 @@ static int detect_flags(void)
{
int flags = 0;
-#if defined(HWCAP_CPUID)
+#if defined(HWCAP_CPUID) && HAVE_INLINE_ASM
unsigned long hwcap = getauxval(AT_HWCAP);
// We can check for DOTPROD and I8MM using HWCAP_ASIMDDP and
// HWCAP2_I8MM too, avoiding to read the CPUID registers (which triggers
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata
ffmpeg | branch: release/6.1 | Andreas Rheinhardt | Mon Oct 30 10:55:36 2023 +0100| [5eca8964a93208ef9c4fac48411ed8fcd8883ea3] | committer: James Almer fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata Fixes ticket #10638 (and should also fix ticket #10482) by restoring the behaviour from before 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f. Signed-off-by: Andreas Rheinhardt (cherry picked from commit 02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eca8964a93208ef9c4fac48411ed8fcd8883ea3 --- fftools/ffmpeg_mux_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index ab2d1d89e4..63a25a350f 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2182,11 +2182,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, if (ret < 0) return ret; -if (type_in == 'g' || type_out == 'g' || !*outspec) +if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic)) *metadata_global_manual = 1; -if (type_in == 's' || type_out == 's' || !*outspec) +if (type_in == 's' || type_out == 's' || (!*outspec && !ic)) *metadata_streams_manual = 1; -if (type_in == 'c' || type_out == 'c' || !*outspec) +if (type_in == 'c' || type_out == 'c' || (!*outspec && !ic)) *metadata_chapters_manual = 1; /* ic is NULL when just disabling automatic mappings */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata
ffmpeg | branch: release/6.0 | Andreas Rheinhardt | Mon Oct 30 10:55:36 2023 +0100| [330b8305c1cd4e3095c048e2fc82bb75d28bd5e1] | committer: James Almer fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata Fixes ticket #10638 (and should also fix ticket #10482) by restoring the behaviour from before 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f. Signed-off-by: Andreas Rheinhardt (cherry picked from commit 02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=330b8305c1cd4e3095c048e2fc82bb75d28bd5e1 --- fftools/ffmpeg_mux_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index e42d5ff26a..ceadb93545 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1822,11 +1822,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, parse_meta_type(mux, inspec, &type_in, &idx_in, &istream_spec); parse_meta_type(mux, outspec, &type_out, &idx_out, &ostream_spec); -if (type_in == 'g' || type_out == 'g') +if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic)) *metadata_global_manual = 1; -if (type_in == 's' || type_out == 's') +if (type_in == 's' || type_out == 's' || (!*outspec && !ic)) *metadata_streams_manual = 1; -if (type_in == 'c' || type_out == 'c') +if (type_in == 'c' || type_out == 'c' || (!*outspec && !ic)) *metadata_chapters_manual = 1; /* ic is NULL when just disabling automatic mappings */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
