Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'

[ffmpeg] / libavcodec / textdec.c

diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c
index c9f02a2a4cbff70d1b79daf550a5cd0fdf2c33cb..a6c8722c1d5f5ef8e4ca3e487bedf5ada5bb58f0 100644 (file)
--- a/libavcodec/textdec.c
+++ b/libavcodec/textdec.c
@@ -37,7 +37,7 @@ typedef struct {
 #define OFFSET(x) offsetof(TextContext, x)
 #define SD AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM
 static const AVOption options[] = {
-    { "keep_ass_markup", "Set if ASS tags must be escaped", OFFSET(keep_ass_markup), AV_OPT_TYPE_INT,    {.i64=0}, 0, 1, .flags=SD },
+    { "keep_ass_markup", "Set if ASS tags must be escaped", OFFSET(keep_ass_markup), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, .flags=SD },
     { NULL }
 };