Message ID | AM7PR03MB6660AB85DB7801E2CFCF15048FF49@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | 7f1edcb4efe6bfd599a9d8432dc693be2bec2833 |
Headers | show |
Series | [FFmpeg-devel,1/4] avfilter/asrc_flite: Don't define an object by accident | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
On 8/6/2021 10:47 PM, Andreas Rheinhardt wrote: > Unused since 1f63665ca567fbc49fa80166d468a822c2999efa. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > Shall I rename ff_ass_split_dialogue2 to ff_ass_split_dialogue? IMO, yes. > > libavcodec/ass_split.c | 19 ------------------- > libavcodec/ass_split.h | 16 ---------------- > 2 files changed, 35 deletions(-) > > diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c > index ea3008ce91..5e3883fea4 100644 > --- a/libavcodec/ass_split.c > +++ b/libavcodec/ass_split.c > @@ -418,25 +418,6 @@ static void free_section(ASSSplitContext *ctx, const ASSSection *section) > av_freep((uint8_t *)&ctx->ass + section->offset); > } > > -ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf, > - int cache, int *number) > -{ > - ASSDialog *dialog = NULL; > - int i, count; > - if (!cache) > - for (i=0; i<FF_ARRAY_ELEMS(ass_sections); i++) > - if (!strcmp(ass_sections[i].section, "Events")) { > - free_section(ctx, &ass_sections[i]); > - break; > - } > - count = ctx->ass.dialogs_count; > - if (ass_split(ctx, buf) == 0) > - dialog = ctx->ass.dialogs + count; > - if (number) > - *number = ctx->ass.dialogs_count - count; > - return dialog; > -} > - > void ff_ass_free_dialog(ASSDialog **dialogp) > { > ASSDialog *dialog = *dialogp; > diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h > index 30ce77250c..2ce756203e 100644 > --- a/libavcodec/ass_split.h > +++ b/libavcodec/ass_split.h > @@ -109,22 +109,6 @@ typedef struct ASSSplitContext ASSSplitContext; > */ > ASSSplitContext *ff_ass_split(const char *buf); > > -/** > - * Split one or several ASS "Dialogue" lines from a string buffer and store > - * them in an already initialized context. > - * > - * @param ctx Context previously initialized by ff_ass_split(). > - * @param buf String containing the ASS "Dialogue" lines. > - * @param cache Set to 1 to keep all the previously split ASSDialog in > - * the context, or set to 0 to free all the previously split > - * ASSDialog. > - * @param number If not NULL, the pointed integer will be set to the number > - * of split ASSDialog. > - * @return Pointer to the first split ASSDialog. > - */ > -ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf, > - int cache, int *number); > - > /** > * Free a dialogue obtained from ff_ass_split_dialog2(). > */ LGTM.
diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index ea3008ce91..5e3883fea4 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -418,25 +418,6 @@ static void free_section(ASSSplitContext *ctx, const ASSSection *section) av_freep((uint8_t *)&ctx->ass + section->offset); } -ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf, - int cache, int *number) -{ - ASSDialog *dialog = NULL; - int i, count; - if (!cache) - for (i=0; i<FF_ARRAY_ELEMS(ass_sections); i++) - if (!strcmp(ass_sections[i].section, "Events")) { - free_section(ctx, &ass_sections[i]); - break; - } - count = ctx->ass.dialogs_count; - if (ass_split(ctx, buf) == 0) - dialog = ctx->ass.dialogs + count; - if (number) - *number = ctx->ass.dialogs_count - count; - return dialog; -} - void ff_ass_free_dialog(ASSDialog **dialogp) { ASSDialog *dialog = *dialogp; diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h index 30ce77250c..2ce756203e 100644 --- a/libavcodec/ass_split.h +++ b/libavcodec/ass_split.h @@ -109,22 +109,6 @@ typedef struct ASSSplitContext ASSSplitContext; */ ASSSplitContext *ff_ass_split(const char *buf); -/** - * Split one or several ASS "Dialogue" lines from a string buffer and store - * them in an already initialized context. - * - * @param ctx Context previously initialized by ff_ass_split(). - * @param buf String containing the ASS "Dialogue" lines. - * @param cache Set to 1 to keep all the previously split ASSDialog in - * the context, or set to 0 to free all the previously split - * ASSDialog. - * @param number If not NULL, the pointed integer will be set to the number - * of split ASSDialog. - * @return Pointer to the first split ASSDialog. - */ -ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf, - int cache, int *number); - /** * Free a dialogue obtained from ff_ass_split_dialog2(). */
Unused since 1f63665ca567fbc49fa80166d468a822c2999efa. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- Shall I rename ff_ass_split_dialogue2 to ff_ass_split_dialogue? libavcodec/ass_split.c | 19 ------------------- libavcodec/ass_split.h | 16 ---------------- 2 files changed, 35 deletions(-)