It's only shadowing the AVOption with the same name. --- avconv.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/avconv.c b/avconv.c index 7caf00a..fbd24c9 100644 --- a/avconv.c +++ b/avconv.c @@ -168,7 +168,6 @@ static int audio_volume = 256; static int exit_on_error = 0; static int using_stdin = 0; static int verbose = 1; -static int thread_count= 1; static int64_t video_size = 0; static int64_t audio_size = 0; static int64_t extra_size = 0; @@ -2569,16 +2568,6 @@ static int opt_top_field_first(const char *opt, const char *arg) return 0; } -static int opt_thread_count(const char *opt, const char *arg) -{ - thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); -#if !HAVE_THREADS - if (verbose >= 0) - fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); -#endif - return 0; -} - static int opt_audio_sample_fmt(const char *opt, const char *arg) { if (strcmp(arg, "list")) { @@ -2844,8 +2833,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) double scale = 1.0; int j; - dec->thread_count = thread_count; - input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); ist = &input_streams[nb_input_streams - 1]; ist->st = st; @@ -3139,8 +3126,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) ost->bitstream_filters = video_bitstream_filters; video_bitstream_filters= NULL; - st->codec->thread_count= thread_count; - video_enc = st->codec; if(video_codec_tag) @@ -3244,8 +3229,6 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) ost->bitstream_filters = audio_bitstream_filters; audio_bitstream_filters= NULL; - st->codec->thread_count= thread_count; - audio_enc = st->codec; audio_enc->codec_type = AVMEDIA_TYPE_AUDIO; @@ -4089,7 +4072,6 @@ static const OptionDef options[] = { { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" }, { "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" }, { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, - { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" }, { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" }, -- 1.7.5.4 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel