virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/ttmlenc: Use string literal macro for default namespacing

Browse Source 
Fixes -Werror=format-security build failures when building with
disabled optimizations and (according to fate.ffmpeg.org also with
several other old GCC versions).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-07-31 04:57:23 +02:00
parent e725c5e24e
commit 1368b5a725
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ttmlenc.c
View File

@ -315,7 +315,7 @@ static int ttml_write_header_content(AVCodecContext *avctx)
}
// write the first string in extradata, attributes in the base "tt" element.
av_bprintf(&s->buffer, ttml_default_namespacing);
av_bprintf(&s->buffer, TTML_DEFAULT_NAMESPACING);
// the cell resolution is in character cells, so not exactly 1:1 against
// a pixel based resolution, but as the tts:extent in the root
// "tt" element is frowned upon (and disallowed in the EBU-TT profile),

10
libavcodec/ttmlenc.h
View File

@ -25,10 +25,10 @@
#define TTMLENC_EXTRADATA_SIGNATURE "lavc-ttmlenc"
#define TTMLENC_EXTRADATA_SIGNATURE_SIZE (sizeof(TTMLENC_EXTRADATA_SIGNATURE) - 1)
static const char *const ttml_default_namespacing =
" xmlns=\"http://www.w3.org/ns/ttml\"\n"
" xmlns:ttm=\"http://www.w3.org/ns/ttml#metadata\"\n"
" xmlns:tts=\"http://www.w3.org/ns/ttml#styling\"\n"
" xmlns:ttp=\"http://www.w3.org/ns/ttml#parameter\"\n";
#define TTML_DEFAULT_NAMESPACING \
" xmlns=\"http://www.w3.org/ns/ttml\"\n" \
" xmlns:ttm=\"http://www.w3.org/ns/ttml#metadata\"\n" \
" xmlns:tts=\"http://www.w3.org/ns/ttml#styling\"\n" \
" xmlns:ttp=\"http://www.w3.org/ns/ttml#parameter\"\n"
#endif /* AVCODEC_TTMLENC_H */

2
libavformat/ttmlenc.c
View File

@ -91,7 +91,7 @@ static int ttml_set_header_values_from_extradata(
if (!additional_data_size) {
// simple case, we don't have to go through local_params and just
// set default fall-back values (for old extradata format).
header_params->tt_element_params = ttml_default_namespacing;
header_params->tt_element_params = TTML_DEFAULT_NAMESPACING;
header_params->pre_body_elements = "";
return 0;