diff options
| author | Jan Ekström <jan.ekstrom@24i.com> | 2021-02-24 14:19:28 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2021-08-25 09:26:46 +0300 |
| commit | 460beb948ceddeb86bd2b3b17335176adcaa7223 (patch) | |
| tree | f33e2d08e979a917ab042b6954e6619f0f061c5f /libavformat/ttmlenc.c | |
| parent | 94653e0dee8d2efa85087e28249249cb3fde3d71 (diff) | |
| download | ffmpeg-460beb948ceddeb86bd2b3b17335176adcaa7223.tar.gz | |
avformat/ttml: split TTML paragraph based or not check into header
This way it can be re-utilized in movenc.
Signed-off-by: Jan Ekström <jan.ekstrom@24i.com>
Diffstat (limited to 'libavformat/ttmlenc.c')
| -rw-r--r-- | libavformat/ttmlenc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c index 8546d35196..896fc81958 100644 --- a/libavformat/ttmlenc.c +++ b/libavformat/ttmlenc.c @@ -30,6 +30,7 @@ #include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" +#include "ttmlenc.h" #include "libavcodec/ttmlenc.h" #include "libavutil/internal.h" @@ -138,13 +139,7 @@ static int ttml_write_header(AVFormatContext *ctx) 0); const char *printed_lang = (lang && lang->value) ? lang->value : ""; - // Not perfect, but decide whether the packet is a document or not - // by the existence of the lavc ttmlenc extradata. - ttml_ctx->input_type = (st->codecpar->extradata && - st->codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE && - !memcmp(st->codecpar->extradata, - TTMLENC_EXTRADATA_SIGNATURE, - TTMLENC_EXTRADATA_SIGNATURE_SIZE)) ? + ttml_ctx->input_type = ff_is_ttml_stream_paragraph_based(st->codecpar) ? PACKET_TYPE_PARAGRAPH : PACKET_TYPE_DOCUMENT; |