diff mbox series

[FFmpeg-devel,08/11] avcodec/movtextdec: Remove unnecessary variable

Message ID 20201017182248.577108-8-andreas.rheinhardt@gmail.com
State Accepted
Commit c84a91eff73d6fa3b75cea75ce389ef94e9327b1
Headers show
Series [FFmpeg-devel,01/11] avcodec/movtextdec: Reset counter of fonts when freeing them
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Oct. 17, 2020, 6:22 p.m. UTC
style_active doesn't do anything any more: It is already assured
that style_active is one when one reaches the end of a style.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/movtextdec.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index d46d64b6f2..1bfca8b79d 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -356,7 +356,6 @@  static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
     MovTextContext *m = avctx->priv_data;
     int i = 0;
     int text_pos = 0;
-    int style_active = 0;
     int entry = 0;
     int color = m->d.color;
 
@@ -374,16 +373,12 @@  static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
         if ((m->box_flags & STYL_BOX) && entry < m->style_entries) {
             const StyleBox *style = &m->s[entry];
             if (text_pos == style->style_end) {
-                if (style_active) {
-                    av_bprintf(buf, "{\\r}");
-                    style_active = 0;
-                    color = m->d.color;
-                }
+                av_bprintf(buf, "{\\r}");
+                color = m->d.color;
                 entry++;
                 style++;
             }
             if (entry < m->style_entries && text_pos == style->style_start) {
-                style_active = 1;
                 if (style->bold ^ m->d.bold)
                     av_bprintf(buf, "{\\b%d}", style->bold);
                 if (style->italic ^ m->d.italic)