diff options
| author | TADANO Tokumei <aimingoff@pc.nifty.jp> | 2023-02-23 19:17:16 +0900 |
|---|---|---|
| committer | rcombs <rcombs@rcombs.me> | 2023-03-28 12:02:55 -0400 |
| commit | e1dc78a13d2bbce6f1ed525a207427b3ac01eab8 (patch) | |
| tree | aad787749fb9dc44cfa26b7cdcc33a823e7ef23f | |
| parent | d6e30291db22b70c3d8a2a41f0f2287854cb6de4 (diff) | |
| download | ffmpeg-e1dc78a13d2bbce6f1ed525a207427b3ac01eab8.tar.gz | |
lavc/codec_desc.c: remove AV_CODEC_PROP_TEXT_SUB property from ARIB_CAPTION
To support bitmap subtitle output, remove AV_CODEC_PROP_TEXT_SUB
property from codec descriptor for AV_CODEC_ID_ARIB_CAPTION.
This is similar to `libavcodec/libzvbi-teletextdec.c`
(AV_CODEC_ID_DVB_TELETEXT).
Instead, each subtitle decoder has to specify a subtitile format.
`libavcodec/libaribb24.c` uses same AV_CODEC_ID_ARIB_CAPTION and
expects AV_CODEC_PROP_TEXT_SUB to be set, so this adds a line to
specify a format there.
Signed-off-by: rcombs <rcombs@rcombs.me>
| -rw-r--r-- | libavcodec/codec_desc.c | 1 | ||||
| -rw-r--r-- | libavcodec/libaribb24.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index d912704891..efdcb59bc9 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3550,7 +3550,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_SUBTITLE, .name = "arib_caption", .long_name = NULL_IF_CONFIG_SMALL("ARIB STD-B24 caption"), - .props = AV_CODEC_PROP_TEXT_SUB, .profiles = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles), }, diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index 8ccf3c4b5d..e3e244be99 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -291,6 +291,7 @@ next_region: av_log(avctx, AV_LOG_DEBUG, "Styled ASS line: %s\n", buf.str); + sub->format = 1; /* text */ ret = ff_ass_add_rect(sub, buf.str, b24->read_order++, 0, NULL, NULL); } |