diff options
| author | Marton Balint <cus@passwd.hu> | 2013-10-20 20:50:54 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2013-11-10 18:57:51 +0100 |
| commit | b689b1f6ee1a6900259f0b1f7de15723125d58a3 (patch) | |
| tree | 8a1d62180c1900a874978fe2e984054c042ec1e3 /libavcodec/libzvbi-teletextdec.c | |
| parent | 688652e0d65dbc2b2a828fbd0f68c557db5aaf39 (diff) | |
libzvbi-teletextdec: use option constants instead of strings
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec/libzvbi-teletextdec.c')
| -rw-r--r-- | libavcodec/libzvbi-teletextdec.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 41accfc83f..b5066e068a 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -48,7 +48,6 @@ typedef struct TeletextContext char *pgno; int x_offset; int y_offset; - char *format; int format_id; /* 0 = bitmap, 1 = text */ int chop_top; int sub_duration; /* in msec */ @@ -437,14 +436,6 @@ static int teletext_init_decoder(AVCodecContext *avctx) ctx->dx = NULL; ctx->vbi = NULL; ctx->pts = AV_NOPTS_VALUE; - if (!strcmp(ctx->format, "bitmap")) { - ctx->format_id = 0; - } else if (!strcmp(ctx->format, "text")) { - ctx->format_id = 1; - } else { - av_log(avctx, AV_LOG_ERROR, "unkown format %s\n", ctx->format); - return AVERROR_OPTION_NOT_FOUND; - } #ifdef DEBUG { @@ -485,7 +476,9 @@ static void teletext_flush(AVCodecContext *avctx) static const AVOption options[] = { {"txt_page", "list of teletext page numbers to decode, * is all", OFFSET(pgno), AV_OPT_TYPE_STRING, {.str = "*"}, 0, 0, SD}, {"txt_chop_top", "discards the top teletext line", OFFSET(chop_top), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, - {"txt_format", "format of the subtitles (bitmap or text)", OFFSET(format), AV_OPT_TYPE_STRING, {.str = "bitmap"}, 0, 0, SD}, + {"txt_format", "format of the subtitles (bitmap or text)", OFFSET(format_id), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, SD, "txt_format"}, + {"bitmap", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, SD, "txt_format"}, + {"text", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, SD, "txt_format"}, {"txt_left", "x offset of generated bitmaps", OFFSET(x_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_top", "y offset of generated bitmaps", OFFSET(y_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_chop_spaces", "chops leading and trailing spaces from text", OFFSET(chop_spaces), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, |