| Revision | 4e7c2f1201bdc7b2faf85f8a913f567b912153c0 (tree) |
|---|---|
| Zeit | 2011-09-12 22:36:42 |
| Autor | yukihane <yukihane.feather@gmai...> |
| Commiter | yukihane |
ffmpeg.cに対する修正と同じものをavconv.cに適用
6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3 に伴う対応
| @@ -54,6 +54,7 @@ | ||
| 54 | 54 | # include "libavfilter/avfiltergraph.h" |
| 55 | 55 | # include "libavfilter/buffersink.h" |
| 56 | 56 | # include "libavfilter/vsrc_buffer.h" |
| 57 | +# include "libavfilter/avtool.h" | |
| 57 | 58 | #endif |
| 58 | 59 | |
| 59 | 60 | #if HAVE_SYS_RESOURCE_H |
| @@ -2161,6 +2162,7 @@ static int transcode_init(OutputFile *output_files, | ||
| 2161 | 2162 | } |
| 2162 | 2163 | |
| 2163 | 2164 | #if CONFIG_AVFILTER |
| 2165 | + tool_registerInfo(input_files[nb_input_files - 1].ctx->duration, output_files[nb_output_files - 1].recording_time); | |
| 2164 | 2166 | if (configure_video_filters(ist, ost)) { |
| 2165 | 2167 | fprintf(stderr, "Error opening filters!\n"); |
| 2166 | 2168 | exit(1); |
| @@ -4092,7 +4094,8 @@ static const OptionDef options[] = { | ||
| 4092 | 4094 | { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, |
| 4093 | 4095 | { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, |
| 4094 | 4096 | #if CONFIG_AVFILTER |
| 4095 | - { "vf", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" }, | |
| 4097 | +// さきゅばすインタフェース互換性維持のため処置 引数を新しいvfでなく古いvfiltersのままとする | |
| 4098 | + { "vfilters", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" }, | |
| 4096 | 4099 | #endif |
| 4097 | 4100 | { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(intra_matrices)}, "specify intra matrix coeffs", "matrix" }, |
| 4098 | 4101 | { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(inter_matrices)}, "specify inter matrix coeffs", "matrix" }, |
Fork
avconv.c