virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/ass_split: Rename ff_ass_split_dialog2->ff_ass_split_dialog

Browse Source 
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-08-07 23:52:42 +02:00
parent 7f1edcb4ef
commit 5ad436fcb9
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ass_split.c
View File

@ -424,7 +424,7 @@ void ff_ass_free_dialog(ASSDialog **dialogp)
av_freep(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; int i;
static const ASSFields fields[] = { static const ASSFields fields[] = {

4
libavcodec/ass_split.h
View File

@ -110,7 +110,7 @@ typedef struct ASSSplitContext ASSSplitContext;
ASSSplitContext *ff_ass_split(const char *buf); 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); 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. * @param buf String containing the ASS "Dialogue" line.
* @return Pointer to the split ASSDialog. Must be freed with ff_ass_free_dialog() * @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. * Free all the memory allocated for an ASSSplitContext.

2
libavcodec/movtextenc.c
View File

@ -654,7 +654,7 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
mov_text_dialog(s, dialog); mov_text_dialog(s, dialog);

2
libavcodec/srtenc.c
View File

@ -245,7 +245,7 @@ static int encode_frame(AVCodecContext *avctx,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->alignment_applied = 0; s->alignment_applied = 0;

2
libavcodec/ttmlenc.c
View File

@ -95,7 +95,7 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

2
libavcodec/webvttenc.c
View File

@ -172,7 +172,7 @@ static int webvtt_encode_frame(AVCodecContext *avctx,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
webvtt_style_apply(s, dialog->style); webvtt_style_apply(s, dialog->style);