diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-03 11:37:04 +0100 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-03 12:17:13 +0100 |
commit | f79b08bf579fcaec388ef173cc737723c71ccb59 (patch) | |
tree | 5b1762ad2cf27a3be4baf1f7e94e169a104e9ee3 /encode_lavc.c | |
parent | 11173115bba7747870932e16cee8c5794494bd87 (diff) | |
download | mpv-f79b08bf579fcaec388ef173cc737723c71ccb59.tar.bz2 mpv-f79b08bf579fcaec388ef173cc737723c71ccb59.tar.xz |
make compile with recent libav
Diffstat (limited to 'encode_lavc.c')
-rw-r--r-- | encode_lavc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/encode_lavc.c b/encode_lavc.c index 66f434410a..5812fe0fed 100644 --- a/encode_lavc.c +++ b/encode_lavc.c @@ -769,44 +769,44 @@ static void encode_lavc_printoptions(void *obj, const char *indent, * Don't print anything but CONST's on level two. * Only print items from the requested unit. */ - if (!unit && opt->type == FF_OPT_TYPE_CONST) + if (!unit && opt->type == AV_OPT_TYPE_CONST) continue; - else if (unit && opt->type != FF_OPT_TYPE_CONST) + else if (unit && opt->type != AV_OPT_TYPE_CONST) continue; - else if (unit && opt->type == FF_OPT_TYPE_CONST + else if (unit && opt->type == AV_OPT_TYPE_CONST && strcmp(unit, opt->unit)) continue; - else if (unit && opt->type == FF_OPT_TYPE_CONST) + else if (unit && opt->type == AV_OPT_TYPE_CONST) mp_msg(MSGT_ENCODE, MSGL_INFO, "%s", subindent); else mp_msg(MSGT_ENCODE, MSGL_INFO, "%s", indent); switch (opt->type) { - case FF_OPT_TYPE_FLAGS: + case AV_OPT_TYPE_FLAGS: snprintf(optbuf, sizeof(optbuf), "%s=<flags>", opt->name); break; - case FF_OPT_TYPE_INT: + case AV_OPT_TYPE_INT: snprintf(optbuf, sizeof(optbuf), "%s=<int>", opt->name); break; - case FF_OPT_TYPE_INT64: + case AV_OPT_TYPE_INT64: snprintf(optbuf, sizeof(optbuf), "%s=<int64>", opt->name); break; - case FF_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_DOUBLE: snprintf(optbuf, sizeof(optbuf), "%s=<double>", opt->name); break; - case FF_OPT_TYPE_FLOAT: + case AV_OPT_TYPE_FLOAT: snprintf(optbuf, sizeof(optbuf), "%s=<float>", opt->name); break; - case FF_OPT_TYPE_STRING: + case AV_OPT_TYPE_STRING: snprintf(optbuf, sizeof(optbuf), "%s=<string>", opt->name); break; - case FF_OPT_TYPE_RATIONAL: + case AV_OPT_TYPE_RATIONAL: snprintf(optbuf, sizeof(optbuf), "%s=<rational>", opt->name); break; - case FF_OPT_TYPE_BINARY: + case AV_OPT_TYPE_BINARY: snprintf(optbuf, sizeof(optbuf), "%s=<binary>", opt->name); break; - case FF_OPT_TYPE_CONST: + case AV_OPT_TYPE_CONST: snprintf(optbuf, sizeof(optbuf), " [+-]%s", opt->name); break; default: @@ -818,7 +818,7 @@ static void encode_lavc_printoptions(void *obj, const char *indent, if (opt->help) mp_msg(MSGT_ENCODE, MSGL_INFO, " %s", opt->help); mp_msg(MSGT_ENCODE, MSGL_INFO, "\n"); - if (opt->unit && opt->type != FF_OPT_TYPE_CONST) + if (opt->unit && opt->type != AV_OPT_TYPE_CONST) encode_lavc_printoptions(obj, indent, subindent, opt->unit, filter_and, filter_eq); } |