From patchwork Sun Feb 18 17:58:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 7639 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp674721jai; Sun, 18 Feb 2018 09:59:06 -0800 (PST) X-Google-Smtp-Source: AH8x2251gifXnRKgQAbpuXlBYgelpsPN5ay8C2mc3/0E3/Pts1kisrXhPd4Gp1YsrTRrEpD9jCVF X-Received: by 10.28.90.197 with SMTP id o188mr9190143wmb.34.1518976746119; Sun, 18 Feb 2018 09:59:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518976746; cv=none; d=google.com; s=arc-20160816; b=iaQZV1R7ZiuA0CjnSk4d0obYLfhKF1uI7EoIZ1gOSlP0guw+oy7OQIS8YdYtYwDXDK d+A6NpNItf/WboAI4h87mYyowQpJRMa4RZKKSJCI0l0ewPp9b18Kztou6UoQm6t1tAYr Q7/szRi2OANMuWVko6oM52GySjYDXs7QeIn2tROMHImRAax1Jr2oi5ieqPxOD2WdzLnV rPp2A97clwA8AHRx/XAwt3Ov/HBWxgvC6JutaDed+gVxA71Wew7BYbtKJM9KxAI74IkF ULm+6LTUbhZb/gbJkllVsYa4zddW7hFgllnnnkADpNmdk3W19VttiuRgtzsz21ntW900 12dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=9hMdOzujGs11rZTwYtA4waXkn4vVvkb3JNcfQYcfrho=; b=O6HtVKk1smQtnqOUbNNsSFsw4RvU8heWRxdYl7TKrm8cS6REbSJI1ZoWElUsfYFv8H CPvneCfDhOdk1WXiKX2+Tus0Tm7Wk5qPrjvJNY6bPi8Q4J8mk8V8lRioNJNYSL8MO+Hy b//QUZ2BojX3BT87ExQrJy7UImlhW8bDBS6mePbuBCnuDnPCYASJMtQy/56mIt0Zg+L5 74MLCTRAdZl79bFYGTCaxycJm3RfBxUFeeoeHRgIqVp1tt+aVb8VvmTIg1fl1CTzixd/ G8WFxoSY6tBdXIQRYWsMGt6UuYn0EBw4GpTdvAw29gGvtZBicTN7lmNkbbZaodUjYe0s tc2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=jxJKgxXH; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=YT3eWPsH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u189si12932292wmd.125.2018.02.18.09.59.05; Sun, 18 Feb 2018 09:59:06 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=jxJKgxXH; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=YT3eWPsH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FFF268A048; Sun, 18 Feb 2018 19:58:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3B3A689C26 for ; Sun, 18 Feb 2018 19:58:27 +0200 (EET) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8F81D20D45 for ; Sun, 18 Feb 2018 12:58:27 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Sun, 18 Feb 2018 12:58:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=WFD+LAZ373NPq+skS 71E6hsUs7JxjpZjR1PARJLhJRo=; b=jxJKgxXHmI2iPVUHbDGIMLo8CraH8CvOj a4T3Dt8AmYodJQhbaqlzBM6XRNQ9l98rwgMVAWCBxe2cfZlxv1WrLQMcwYk/kFar 4tWxaCIMQGe04SqynGjN5Y2K5P/T9IvpD37O9zVMrTWBdsV82DZtTKn8ekrn1sYn aKWQcVLdSPky+P7iYNDR8dD6nrE6yoxtMGr17GRIygOB0Frhoa114IoaEUbzOqQe 9MzEWCzfiw6pq932tYnnAfVXpEvOWN4iWihbDdiD7epwfpYmJD0O2W74KKUVSqoG I2/PtzNwm0g03krt67n4AMSsoJJucCHII35fHE9U0HeVqs7E06Ykw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=WFD+LAZ373NPq+skS71E6hsUs7JxjpZjR1PARJLhJRo=; b=YT3eWPsH R++cQPuzdmHvGRk6KMt3tp+Ijc8O5qSI0F8Ia/RHCduzgb2OZxMxJ5vpp09fleWP kCrBEDFU9AqdP4xUx/b6cXtUliX1emma1jBpt3S2rx91E0LwZlvmIXyMcSpyJalX h/1e5x26KLWkDO3uqDl8GJ8CsMPuua2k3vuNVSsXJQFn8J/yPeGeRAFJhOjLeYCk 5tIxMhUFz50AMHvimhq0DQR7FG5oIEftrcy1s+nGvihIDvBmLT2xC8OcifrONJ9D J67PfI1fx4+qnfPPHFvuucslKazjGfJnyQ6MAtRlg70URJmXmLrqvLIlmIwqH6lr khAZXcpSE2YtyA== X-ME-Sender: Received: from DESKTOP-UATPK6A.localdomain (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 09582244F9 for ; Sun, 18 Feb 2018 12:58:26 -0500 (EST) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2018 17:58:19 +0000 Message-Id: <1518976699-24197-4-git-send-email-josh@itanimul.li> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518976699-24197-1-git-send-email-josh@itanimul.li> References: <1518976699-24197-1-git-send-email-josh@itanimul.li> Subject: [FFmpeg-devel] [PATCH 3/3] lavc, lavd, lavf, lavfi, tests: remove several register() calls X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavdevice/lavfi.c | 2 -- libavfilter/lavfutils.c | 2 -- libavfilter/src_movie.c | 2 -- libavfilter/tests/filtfmts.c | 2 -- libavformat/tests/movenc.c | 2 -- libavformat/tests/seek.c | 3 --- tests/api/api-band-test.c | 2 -- tests/api/api-codec-param-test.c | 2 -- tests/api/api-flac-test.c | 2 -- tests/api/api-h264-test.c | 2 -- tests/api/api-seek-test.c | 2 -- tools/aviocat.c | 1 - tools/enum_options.c | 2 -- tools/graph2dot.c | 2 -- tools/ismindex.c | 2 -- tools/pktdumper.c | 3 --- tools/probetest.c | 3 --- tools/seek_print.c | 1 - tools/sidxindex.c | 2 -- tools/uncoded_frame.c | 4 ---- 20 files changed, 43 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 6f2ae95..ca8f05f 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -130,8 +130,6 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) if (!pix_fmts) FAIL(AVERROR(ENOMEM)); - avfilter_register_all(); - buffersink = avfilter_get_by_name("buffersink"); abuffersink = avfilter_get_by_name("abuffersink"); diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index b6319cf..db4b69b 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -37,8 +37,6 @@ int ff_load_image(uint8_t *data[4], int linesize[4], av_init_packet(&pkt); - av_register_all(); - iformat = av_find_input_format("image2pipe"); if ((ret = avformat_open_input(&format_ctx, filename, iformat, NULL)) < 0) { av_log(log_ctx, AV_LOG_ERROR, diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 258ba50..bcabfcc 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -239,8 +239,6 @@ static av_cold int movie_common_init(AVFilterContext *ctx) return AVERROR_PATCHWELCOME; } - av_register_all(); - // Try to find the movie format (container) iformat = movie->format_name ? av_find_input_format(movie->format_name) : NULL; diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 72b860a..a958621 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -97,8 +97,6 @@ int main(int argc, char **argv) if (!graph_ctx) return 1; - avfilter_register_all(); - /* get a corresponding filter and open it */ if (!(filter = avfilter_get_by_name(filter_name))) { fprintf(stderr, "Unrecognized filter with name '%s'\n", filter_name); diff --git a/libavformat/tests/movenc.c b/libavformat/tests/movenc.c index ad6c92a..1d15d97 100644 --- a/libavformat/tests/movenc.c +++ b/libavformat/tests/movenc.c @@ -379,8 +379,6 @@ int main(int argc, char **argv) } } - av_register_all(); - md5 = av_md5_alloc(); if (!md5) return 1; diff --git a/libavformat/tests/seek.c b/libavformat/tests/seek.c index 7ed56ba..e0067a6 100644 --- a/libavformat/tests/seek.c +++ b/libavformat/tests/seek.c @@ -91,9 +91,6 @@ int main(int argc, char **argv) av_dict_set(&format_opts, "channels", "1", 0); av_dict_set(&format_opts, "sample_rate", "22050", 0); - /* initialize libavcodec, and register all codecs and formats */ - av_register_all(); - if (argc < 2) { printf("usage: %s input_file\n" "\n", argv[0]); diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c index 5ccba4f..a84f6b7 100644 --- a/tests/api/api-band-test.c +++ b/tests/api/api-band-test.c @@ -214,8 +214,6 @@ int main(int argc, char **argv) return 1; } - av_register_all(); - if (video_decode(argv[1]) != 0) return 1; diff --git a/tests/api/api-codec-param-test.c b/tests/api/api-codec-param-test.c index 377a5e9..0868322 100644 --- a/tests/api/api-codec-param-test.c +++ b/tests/api/api-codec-param-test.c @@ -231,8 +231,6 @@ int main(int argc, char* argv[]) AVFormatContext *fmt_ctx = NULL; AVFormatContext *fmt_ctx_no_decode = NULL; - av_register_all(); - if (argc < 2) { av_log(NULL, AV_LOG_ERROR, "Usage: %s \n", argv[0]); return -1; diff --git a/tests/api/api-flac-test.c b/tests/api/api-flac-test.c index c5a37f0..2e90812 100644 --- a/tests/api/api-flac-test.c +++ b/tests/api/api-flac-test.c @@ -245,8 +245,6 @@ int main(void) int sample_rates[] = {8000, 44100, 48000, 192000}; int cl, sr; - avcodec_register_all(); - enc = avcodec_find_encoder(AV_CODEC_ID_FLAC); if (!enc) { av_log(NULL, AV_LOG_ERROR, "Can't find encoder\n"); diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c index 52282e0..66669fa 100644 --- a/tests/api/api-h264-test.c +++ b/tests/api/api-h264-test.c @@ -158,8 +158,6 @@ int main(int argc, char **argv) return 1; } - av_register_all(); - if (video_decode_example(argv[1]) != 0) return 1; diff --git a/tests/api/api-seek-test.c b/tests/api/api-seek-test.c index 2b32cb9..d0531a2 100644 --- a/tests/api/api-seek-test.c +++ b/tests/api/api-seek-test.c @@ -279,8 +279,6 @@ int main(int argc, char **argv) return 1; } - av_register_all(); - if (seek_test(argv[1], argv[2], argv[3]) != 0) return 1; diff --git a/tools/aviocat.c b/tools/aviocat.c index 28529b0..2aa08b9 100644 --- a/tools/aviocat.c +++ b/tools/aviocat.c @@ -42,7 +42,6 @@ int main(int argc, char **argv) AVDictionary *in_opts = NULL; AVDictionary *out_opts = NULL; - av_register_all(); avformat_network_init(); for (i = 1; i < argc; i++) { diff --git a/tools/enum_options.c b/tools/enum_options.c index c2a295c..77e1f9f 100644 --- a/tools/enum_options.c +++ b/tools/enum_options.c @@ -130,8 +130,6 @@ int main(int argc, char **argv) if (argc < 2) print_usage(); - av_register_all(); - if (!strcmp(argv[1], "format")) show_format_opts(); else if (!strcmp(argv[1], "codec")) diff --git a/tools/graph2dot.c b/tools/graph2dot.c index 21d0795..d5c1e4e 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -189,8 +189,6 @@ int main(int argc, char **argv) *p = '\0'; } - avfilter_register_all(); - if (avfilter_graph_parse(graph, graph_string, NULL, NULL, NULL) < 0) { fprintf(stderr, "Failed to parse the graph description\n"); return 1; diff --git a/tools/ismindex.c b/tools/ismindex.c index 0254a98..7601f62 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -791,8 +791,6 @@ int main(int argc, char **argv) int split = 0, ismf = 0, i; struct Tracks tracks = { 0, .video_track = -1, .audio_track = -1 }; - av_register_all(); - for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-n")) { basename = argv[i + 1]; diff --git a/tools/pktdumper.c b/tools/pktdumper.c index 6516ad3..16a965b 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -89,9 +89,6 @@ int main(int argc, char **argv) strcat(fntemplate, PKTFILESUFF); printf("FNTEMPLATE: '%s'\n", fntemplate); - // register all file formats - av_register_all(); - err = avformat_open_input(&fctx, argv[1], NULL, NULL); if (err < 0) { fprintf(stderr, "cannot open input: error %d\n", err); diff --git a/tools/probetest.c b/tools/probetest.c index 74045eb..2c6c1de 100644 --- a/tools/probetest.c +++ b/tools/probetest.c @@ -124,9 +124,6 @@ int main(int argc, char **argv) return 1; } - avcodec_register_all(); - av_register_all(); - av_lfg_init(&state, 0xdeadbeef); pd.buf = NULL; diff --git a/tools/seek_print.c b/tools/seek_print.c index de876b4..9280421 100644 --- a/tools/seek_print.c +++ b/tools/seek_print.c @@ -65,7 +65,6 @@ int main(int argc, char **argv) argv++; argc--; - av_register_all(); if ((ret = avformat_open_input(&avf, filename, NULL, NULL)) < 0) { fprintf(stderr, "%s: %s\n", filename, av_err2str(ret)); return 1; diff --git a/tools/sidxindex.c b/tools/sidxindex.c index be28461..a4f9551 100644 --- a/tools/sidxindex.c +++ b/tools/sidxindex.c @@ -363,8 +363,6 @@ int main(int argc, char **argv) struct Tracks tracks = { 0 }; int i; - av_register_all(); - for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-out")) { out = argv[i + 1]; diff --git a/tools/uncoded_frame.c b/tools/uncoded_frame.c index 3aaa4b6..efea445 100644 --- a/tools/uncoded_frame.c +++ b/tools/uncoded_frame.c @@ -62,10 +62,6 @@ int main(int argc, char **argv) out_dev_name = argv + 2; nb_out_dev = argc - 2; - av_register_all(); - avdevice_register_all(); - avfilter_register_all(); - /* Create input graph */ if (!(in_graph = avfilter_graph_alloc())) { ret = AVERROR(ENOMEM);