Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / ass_split.c

diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c
index a0b72542c745d915bf0c8685b116d5125cedb68b..7ee48b4a5cb09a7af1f7478811977bccfa25ae1e 100644 (file)
--- a/libavcodec/ass_split.c
+++ b/libavcodec/ass_split.c
@@ -352,8 +352,10 @@ void ff_ass_split_free(ASSSplitContext *ctx)
 {
     if (ctx) {
         int i;
-        for (i=0; i<FF_ARRAY_ELEMS(ass_sections); i++)
+        for (i=0; i<FF_ARRAY_ELEMS(ass_sections); i++) {
             free_section(ctx, &ass_sections[i]);
+            av_freep(&(ctx->field_order[i]));
+        }
         av_free(ctx);
     }
 }
@@ -454,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;