ffmpeg.cに対する修正と同じものをavconv.cに適用

6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3 に伴う対応
(cherry picked from commit 4e7c2f1201bdc7b2faf85f8a913f567b912153c0)

diff --git a/avconv.c b/avconv.c
index 74120c8..f166d1d 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -50,6 +50,7 @@
 # include "libavfilter/avfilter.h"
 # include "libavfilter/avfiltergraph.h"
 # include "libavfilter/vsrc_buffer.h"
+# include "libavfilter/avtool.h"
 #endif
 
 #if HAVE_SYS_RESOURCE_H
@@ -2100,6 +2101,7 @@ static int transcode_init(OutputFile *output_files,
                 codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num};
 
 #if CONFIG_AVFILTER
+                tool_registerInfo(input_files[nb_input_files - 1].ctx->duration, output_files[nb_output_files - 1].recording_time);
                 if (configure_video_filters(ist, ost)) {
                     fprintf(stderr, "Error opening filters!\n");
                     exit(1);
@@ -3971,7 +3973,8 @@ static const OptionDef options[] = {
     { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
     { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
 #if CONFIG_AVFILTER
-    { "vf", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" },
+// さきゅばすインタフェース互換性維持のため処置 引数を新しいvfでなく古いvfiltersのままとする
+    { "vfilters", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" },
 #endif
     { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(intra_matrices)}, "specify intra matrix coeffs", "matrix" },
     { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(inter_matrices)}, "specify inter matrix coeffs", "matrix" },