mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec/ass_split: Rename ff_ass_split_dialog2->ff_ass_split_dialog
Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
7f1edcb4ef
commit
5ad436fcb9
@ -424,7 +424,7 @@ void ff_ass_free_dialog(ASSDialog **dialogp)
|
||||
av_freep(dialogp);
|
||||
}
|
||||
|
||||
ASSDialog *ff_ass_split_dialog2(ASSSplitContext *ctx, const char *buf)
|
||||
ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf)
|
||||
{
|
||||
int i;
|
||||
static const ASSFields fields[] = {
|
||||
|
@ -110,7 +110,7 @@ typedef struct ASSSplitContext ASSSplitContext;
|
||||
ASSSplitContext *ff_ass_split(const char *buf);
|
||||
|
||||
/**
|
||||
* Free a dialogue obtained from ff_ass_split_dialog2().
|
||||
* Free a dialogue obtained from ff_ass_split_dialog().
|
||||
*/
|
||||
void ff_ass_free_dialog(ASSDialog **dialogp);
|
||||
|
||||
@ -121,7 +121,7 @@ void ff_ass_free_dialog(ASSDialog **dialogp);
|
||||
* @param buf String containing the ASS "Dialogue" line.
|
||||
* @return Pointer to the split ASSDialog. Must be freed with ff_ass_free_dialog()
|
||||
*/
|
||||
ASSDialog *ff_ass_split_dialog2(ASSSplitContext *ctx, const char *buf);
|
||||
ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf);
|
||||
|
||||
/**
|
||||
* Free all the memory allocated for an ASSSplitContext.
|
||||
|
@ -654,7 +654,7 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
|
||||
dialog = ff_ass_split_dialog(s->ass_ctx, ass);
|
||||
if (!dialog)
|
||||
return AVERROR(ENOMEM);
|
||||
mov_text_dialog(s, dialog);
|
||||
|
@ -245,7 +245,7 @@ static int encode_frame(AVCodecContext *avctx,
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
|
||||
dialog = ff_ass_split_dialog(s->ass_ctx, ass);
|
||||
if (!dialog)
|
||||
return AVERROR(ENOMEM);
|
||||
s->alignment_applied = 0;
|
||||
|
@ -95,7 +95,7 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf,
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
|
||||
dialog = ff_ass_split_dialog(s->ass_ctx, ass);
|
||||
if (!dialog)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
|
@ -172,7 +172,7 @@ static int webvtt_encode_frame(AVCodecContext *avctx,
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
|
||||
dialog = ff_ass_split_dialog(s->ass_ctx, ass);
|
||||
if (!dialog)
|
||||
return AVERROR(ENOMEM);
|
||||
webvtt_style_apply(s, dialog->style);
|
||||
|
Loading…
Reference in New Issue
Block a user