Merge commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a'

[ffmpeg] / libavcodec / libzvbi-teletextdec.c

diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c
index 22acd3980e28a7e77b62ddb14bd90375191c0c1e..ff968ad29c150c9018e7e853c9cb018e5d357a67 100644 (file)
--- a/libavcodec/libzvbi-teletextdec.c
+++ b/libavcodec/libzvbi-teletextdec.c
@@ -229,7 +229,6 @@ static int gen_sub_bitmap(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_pa
     int resx = page->columns * BITMAP_CHAR_WIDTH;
     int resy = (page->rows - chop_top) * BITMAP_CHAR_HEIGHT;
     uint8_t ci, cmax = 0;
-    int ret;
     vbi_char *vc = page->text + (chop_top * page->columns);
     vbi_char *vcend = page->text + (page->rows * page->columns);