Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / ass_split.c

diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c
index 81d501eefe6f4d3f58f21e4ab58a3e277ea63388..7ee48b4a5cb09a7af1f7478811977bccfa25ae1e 100644 (file)
--- a/libavcodec/ass_split.c
+++ b/libavcodec/ass_split.c
@@ -456,7 +456,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
     return 0;
 }
 
-ASSStyle *ass_style_get(ASSSplitContext *ctx, const char *style)
+ASSStyle *ff_ass_style_get(ASSSplitContext *ctx, const char *style)
 {
     ASS *ass = &ctx->ass;
     int i;