tools/enum_options: fix build and add to Makefile

pull/358/head
Anton Khirnov 5 years ago
parent 5bd870a212
commit 65c4d5d72e
  1. 3
      Makefile
  2. 2
      tools/Makefile
  3. 26
      tools/enum_options.c

@ -62,6 +62,9 @@ tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS) tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
tools/enum_options$(EXESUF): ELIBS = $(FF_EXTRALIBS)
tools/enum_options$(EXESUF): $(FF_DEP_LIBS)
tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS) tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)

@ -1,4 +1,4 @@
TOOLS = qt-faststart trasher uncoded_frame TOOLS = enum_options qt-faststart trasher uncoded_frame
TOOLS-$(CONFIG_LIBMYSOFA) += sofa2wavs TOOLS-$(CONFIG_LIBMYSOFA) += sofa2wavs
TOOLS-$(CONFIG_ZLIB) += cws2fws TOOLS-$(CONFIG_ZLIB) += cws2fws

@ -40,14 +40,14 @@ static void print_option(const AVClass *class, const AVOption *o)
{ {
printf("@item -%s @var{", o->name); printf("@item -%s @var{", o->name);
switch (o->type) { switch (o->type) {
case FF_OPT_TYPE_BINARY: printf("hexadecimal string"); break; case AV_OPT_TYPE_BINARY: printf("hexadecimal string"); break;
case FF_OPT_TYPE_STRING: printf("string"); break; case AV_OPT_TYPE_STRING: printf("string"); break;
case FF_OPT_TYPE_INT: case AV_OPT_TYPE_INT:
case FF_OPT_TYPE_INT64: printf("integer"); break; case AV_OPT_TYPE_INT64: printf("integer"); break;
case FF_OPT_TYPE_FLOAT: case AV_OPT_TYPE_FLOAT:
case FF_OPT_TYPE_DOUBLE: printf("float"); break; case AV_OPT_TYPE_DOUBLE: printf("float"); break;
case FF_OPT_TYPE_RATIONAL: printf("rational number"); break; case AV_OPT_TYPE_RATIONAL: printf("rational number"); break;
case FF_OPT_TYPE_FLAGS: printf("flags"); break; case AV_OPT_TYPE_FLAGS: printf("flags"); break;
default: printf("value"); break; default: printf("value"); break;
} }
printf("} (@emph{"); printf("} (@emph{");
@ -68,8 +68,8 @@ static void print_option(const AVClass *class, const AVOption *o)
const AVOption *u = NULL; const AVOption *u = NULL;
printf("\nPossible values:\n@table @samp\n"); printf("\nPossible values:\n@table @samp\n");
while ((u = av_next_option(&class, u))) while ((u = av_opt_next(&class, u)))
if (u->type == FF_OPT_TYPE_CONST && u->unit && !strcmp(u->unit, o->unit)) if (u->type == AV_OPT_TYPE_CONST && u->unit && !strcmp(u->unit, o->unit))
printf("@item %s\n%s\n", u->name, u->help ? u->help : ""); printf("@item %s\n%s\n", u->name, u->help ? u->help : "");
printf("@end table\n"); printf("@end table\n");
} }
@ -80,8 +80,8 @@ static void show_opts(const AVClass *class)
const AVOption *o = NULL; const AVOption *o = NULL;
printf("@table @option\n"); printf("@table @option\n");
while ((o = av_next_option(&class, o))) while ((o = av_opt_next(&class, o)))
if (o->type != FF_OPT_TYPE_CONST) if (o->type != AV_OPT_TYPE_CONST)
print_option(class, o); print_option(class, o);
printf("@end table\n"); printf("@end table\n");
} }
@ -114,7 +114,7 @@ static void show_format_opts(void)
static void show_codec_opts(void) static void show_codec_opts(void)
{ {
void *iter = NULL; void *iter = NULL;
AVCodec *c = NULL; const AVCodec *c;
printf("@section Generic codec AVOptions\n"); printf("@section Generic codec AVOptions\n");
show_opts(avcodec_get_class()); show_opts(avcodec_get_class());

Loading…
Cancel
Save