| リビジョン | a332158cb0385c69e5968aaa9940660c03e3dfbe (tree) |
|---|---|
| 日時 | 2011-09-13 00:09:45 |
| 作者 | yukihane <yukihane.feather@gmai...> |
| コミッター | yukihane |
ffmpeg.cに対する修正と同じものをavconv.cに適用
6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3 に伴う対応
(cherry picked from commit 4e7c2f1201bdc7b2faf85f8a913f567b912153c0)
| @@ -50,6 +50,7 @@ | ||
| 50 | 50 | # include "libavfilter/avfilter.h" |
| 51 | 51 | # include "libavfilter/avfiltergraph.h" |
| 52 | 52 | # include "libavfilter/vsrc_buffer.h" |
| 53 | +# include "libavfilter/avtool.h" | |
| 53 | 54 | #endif |
| 54 | 55 | |
| 55 | 56 | #if HAVE_SYS_RESOURCE_H |
| @@ -2100,6 +2101,7 @@ static int transcode_init(OutputFile *output_files, | ||
| 2100 | 2101 | codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num}; |
| 2101 | 2102 | |
| 2102 | 2103 | #if CONFIG_AVFILTER |
| 2104 | + tool_registerInfo(input_files[nb_input_files - 1].ctx->duration, output_files[nb_output_files - 1].recording_time); | |
| 2103 | 2105 | if (configure_video_filters(ist, ost)) { |
| 2104 | 2106 | fprintf(stderr, "Error opening filters!\n"); |
| 2105 | 2107 | exit(1); |
| @@ -3971,7 +3973,8 @@ static const OptionDef options[] = { | ||
| 3971 | 3973 | { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, |
| 3972 | 3974 | { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, |
| 3973 | 3975 | #if CONFIG_AVFILTER |
| 3974 | - { "vf", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" }, | |
| 3976 | +// さきゅばすインタフェース互換性維持のため処置 引数を新しいvfでなく古いvfiltersのままとする | |
| 3977 | + { "vfilters", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" }, | |
| 3975 | 3978 | #endif |
| 3976 | 3979 | { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(intra_matrices)}, "specify intra matrix coeffs", "matrix" }, |
| 3977 | 3980 | { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(inter_matrices)}, "specify inter matrix coeffs", "matrix" }, |
Fork
avconv.c