From patchwork Tue Apr 7 17:19:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18752 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9F01444A272 for ; Tue, 7 Apr 2020 20:20:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8093C68B61A; Tue, 7 Apr 2020 20:20:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A174E68B560 for ; Tue, 7 Apr 2020 20:19:59 +0300 (EEST) Received: by mail-wm1-f43.google.com with SMTP id e26so2510474wmk.5 for ; Tue, 07 Apr 2020 10:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bcyp4ddeNpXEkh34lnjHDtBp0mXoOfg7ceAVVg9bTrY=; b=OdNt5Pvt4hfd0VY7QONTaPsPa2KtcGrcRoqUpdmCynAe64+G6Z4RTz/u+xJnG1Li2t pd6km4ZMbE0ChLJr/dnu3cDpQQKWK9SDfhRA3fEZD7JxW71c7+AbEjJm+oFJurH7SiLC mZFsIoXDOfSXLQ9o4PBQswUjisf1PBLVfqUqunf70DEw8xgTxa9xYMYtL8ml8gANZnMB tu7AaCOLtjTgWlmZ4X1QYAk14pxCMFspiUl4mcRW3qhi519mXiB767KxAJzM7M1RRsvc msMrp4EXSVJbA/x0ptMt1j4p+QY3XdloxpDcGqo8/lNq1Xx0K2aTzR1OsFJ60icZWFWG RPTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bcyp4ddeNpXEkh34lnjHDtBp0mXoOfg7ceAVVg9bTrY=; b=M/h03s3EgbpBytQoGcamHHniY8CL5MfcGTHbCVQWydoyGTzPivMUa5i7jBkeUP3Gh1 Mu6iXn7/1Iv81V4LFkKCc6DlCZQDVCermQF4tc9wtsFy38IZ11SyJlMdmKAubn9Cv2+P dQMOuNY5PpgPTjk+FCokx4eZRvZvwEDRZRfN74OUamjk8LxfQnndiB8eC/u9kbYSarZy pVBzmZdSm+iTbdfDDx6RnwxxZfSmW8TgAn0LFpmF9hCQXAb9M0wYi359K/00qnLmEo60 TW+NFTJT9c12zcZYUWxfrxDu0SkZcT8F/rfarV6gOkiYIyCI9okJACyiQLNCmR1lgS6f BL5Q== X-Gm-Message-State: AGi0PuZNXwjNICNJb8aPjE0ONR4qW9+5zsgZS3ll32XtDhdC0hjSKk4z ojPWp9BMgdbn2K6XdvwmXq2O3cK1 X-Google-Smtp-Source: APiQypLM91FcDPXXF56fQyDJ/O17itUhLVbajt9B2Tr3jEUAbuaZ7R5jGdOFSbKbJfpEo5+e+04e3g== X-Received: by 2002:a7b:c0d1:: with SMTP id s17mr339451wmh.58.1586279998594; Tue, 07 Apr 2020 10:19:58 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id a8sm3068253wmb.39.2020.04.07.10.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 10:19:57 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 19:19:50 +0200 Message-Id: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/Makefile: Add missing rawenc dependency for iLBC muxer 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Forgotten in ab502fab. Signed-off-by: Andreas Rheinhardt --- Sorry for this mistake in ab502fab. 054ce5f786f0bff2491bda5497850d2390621176 is not a real fix, because --disable-everything --enable-muxer=ilbc would still fail. libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 8fd0d43721..9d4c230bcf 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -239,7 +239,7 @@ OBJS-$(CONFIG_IDF_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_IFF_DEMUXER) += iff.o OBJS-$(CONFIG_IFV_DEMUXER) += ifv.o OBJS-$(CONFIG_ILBC_DEMUXER) += ilbc.o -OBJS-$(CONFIG_ILBC_MUXER) += ilbc.o +OBJS-$(CONFIG_ILBC_MUXER) += ilbc.o rawenc.o OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE2_MUXER) += img2enc.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2dec.o img2.o From patchwork Tue Apr 7 21:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18760 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C4FDD44AF3F for ; Wed, 8 Apr 2020 00:46:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A24C668B6AA; Wed, 8 Apr 2020 00:46:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B2868B5F3 for ; Wed, 8 Apr 2020 00:46:18 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id g3so5600908wrx.2 for ; Tue, 07 Apr 2020 14:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5hs143XpCvDSrp4iZWlw6/zLIBrRb8QOKXAnp9VWvno=; b=fYD/5sFaiQvOOzTUHit3LS8okSBWSzqPZWM0QjeWkE67XqgVa/TPSDVjbOfCpAxXVg tScDd9p+IlJ2+8qeCyBIv0E93zy4Hx1Y58wBUDBsAD4wLIsZLEfrMobxXtdzrxOAnIGW lT2nPhsdf+iNfEGPQ4XILy60t7TyL/kZFS2r5mFP7fQj9rTyJxA3bu9dQK/UVFufVwKj nDdzF++2QJOmUgtQQhaKmqRRXClb2+c3+r45gKS03kM+Fb15g1qwjuFMDZAYdzMuC33F zw86AEIXhUx8atyDKf9y8wada9PLcQodR2RRY+W6OumgiqvWZEI28Bf+BC1u+U502LbK 4ntQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5hs143XpCvDSrp4iZWlw6/zLIBrRb8QOKXAnp9VWvno=; b=tTRCjMOYAfvzK0VdT1Y2kbl+znR2M0eUw/yKv/XS2vpWcF6v8qBx3uSVA5fab2Ctiw l+97mNzTGG7a0qrhvfVIgi/uE8X/olnyJgTf5qvBViXQUX5/RdKZxaVzlX7Mf2H8KkyK gn2J7RLMeXoXNPE5Iuk//nnybvwWDAFqJR7rrz3o8jkIdq79JrIg+ccrRmIeJ1rdhu5u i2KfC0Q04UvNslHsw7IeOhoZItM05aolWeSQybVvqBrQuEvTCAuYYQW+wzxppg5K5F1j daiEisWPznP8OidVgJInvDVU4ddX/VWH0V2XORtihimhKmEk0ZvC7RXCh0IHtOSdAnK3 Royg== X-Gm-Message-State: AGi0PubUce6qIoAxaYoz6yl7MTnMDfu+e9YXfJxXNbBXuJiJt9Nyeuaj 1xg8paIS6X/RaZzEW0NPTPSvkTEq X-Google-Smtp-Source: APiQypKFIpnBiljwUFWGMgpeh52hOWG6jC3mu38GN5LgRa+W7MeDEv/XSyrnyEQ5eUD7AQo3ex2dSQ== X-Received: by 2002:a05:6000:120a:: with SMTP id e10mr5119703wrx.188.1586295977636; Tue, 07 Apr 2020 14:46:17 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:16 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:55 +0200 Message-Id: <20200407214603.19798-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] configure, libavformat/Makefile: Fix webm_chunk dependencies 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The webm_chunk muxer requires the WebM muxer, yet it does not directly require anything from libavformat/matroska.c (it does not even include the corresponding header). So remove the dependency from the Makefile and add a _select to configure. Signed-off-by: Andreas Rheinhardt --- configure | 1 + libavformat/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 09bda9b408..2f08d06af7 100755 --- a/configure +++ b/configure @@ -3335,6 +3335,7 @@ w64_demuxer_select="wav_demuxer" w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" +webm_chunk_muxer_select="webm_muxer" webm_muxer_select="iso_media riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" wtv_demuxer_select="mpegts_demuxer riffdec" diff --git a/libavformat/Makefile b/libavformat/Makefile index 9d4c230bcf..f72fa6fb1a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -555,7 +555,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ wv.o vorbiscomment.o \ webmdashenc.o webm_chunk.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o matroska.o -OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o matroska.o +OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o From patchwork Tue Apr 7 21:45:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18761 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EB98544AF3F for ; Wed, 8 Apr 2020 00:46:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEDE068B6C8; Wed, 8 Apr 2020 00:46:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C420B68B60E for ; Wed, 8 Apr 2020 00:46:19 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id g3so5600956wrx.2 for ; Tue, 07 Apr 2020 14:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FQxO63olgOZ2hPKDCKxJLtrPIHIYS7+abG2SIw7hNeI=; b=mGTeJucRuczg7Xlr6S9TTCtvf0pUxqKtWbGfBogXuBE5Jaw1RC/6HrzygBmQgn1FWV KP2EGF+aEG52ww48SiiILSzR2slhjbOvmrl0O6RBmLMRp04T+mGte9o8E4CtnpwPWBpF vhO6b31SeNn5pe0Ul0uCzOcVa3hSwFcV60TuofrXW04mf26rq7PHZSdMIHXAFbmzVoCc tidM9VzUcRqbXpKcdpCwDW6xzoUWJIYUdmX3fv58zncxoXzqRmUfC/a0lS7bVwfICefR 5gtV9fbSkujcy0upzwH2VDZ8e+bXCRNi18+iShaqy/9OrVMonuKwdawfMsVD2iKTlrUv 0g8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FQxO63olgOZ2hPKDCKxJLtrPIHIYS7+abG2SIw7hNeI=; b=UgX6GBefgqz/lEykAmT2N7QIHAlMmSgiwby8pe2Lxgpi8DZ+TquKMcD1Dg9Il583+t OPpkVGR2l3HKYKTF/3WC9JP5B15WCj87KnLIMihH8/Ozpie1aXhSfGuOXCNiHnZ+awdi zHWYdoRl5fVAHGd+83RgHn4RxWeUQDK+agbE1dt1gsJ4cQS0ejxTupr2cj8Z6lhXgcsV q0/yghXHWOUYysYjqHRBCQdmbGlBb0Smk72V9wDvWDhNUH5RyGSmlge6w7PGy33uasXh tuQIzqn8KW3db8b3C3r7wkgDO+bEq6aRplXyacoDBJ2LaNxx+x8HCLc5NCOeLwpvv3WT +wNw== X-Gm-Message-State: AGi0Pub31cL4znILRJlN1H3AbJtJezeqQYGjHFC68wkZpaDCkgzFbCtY J41CHJhhx8z7/od/9I4NdNsxz4Lf X-Google-Smtp-Source: APiQypJ3vEj4iRCgmZTeA+XudGcbya/QuUKXHU+Ecct7fdMaQvVet/yjTWY4prt+O+AeimpfZ8yosQ== X-Received: by 2002:adf:ee41:: with SMTP id w1mr5229345wro.276.1586295978791; Tue, 07 Apr 2020 14:46:18 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:18 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:56 +0200 Message-Id: <20200407214603.19798-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avformat/webm_chunk: Remove superfluous headers 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" libavutil/avstring.h is unnecessary since 8a632b3e. The other unnecessary headers were never used. Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 6e48a36b24..f079c5c65e 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -24,23 +24,14 @@ * chunk, followed by data chunks where each Cluster is written out as a Chunk. */ -#include -#include - #include "avformat.h" #include "avio.h" #include "avio_internal.h" #include "internal.h" -#include "libavutil/avassert.h" #include "libavutil/log.h" #include "libavutil/opt.h" -#include "libavutil/avstring.h" -#include "libavutil/parseutils.h" #include "libavutil/mathematics.h" -#include "libavutil/time.h" -#include "libavutil/time_internal.h" -#include "libavutil/timestamp.h" #define MAX_FILENAME_SIZE 1024 From patchwork Tue Apr 7 21:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18762 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 24C4744AF3F for ; Wed, 8 Apr 2020 00:46:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10F1F68B6D2; Wed, 8 Apr 2020 00:46:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C81EA68B6B0 for ; Wed, 8 Apr 2020 00:46:20 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id k1so5602611wrm.3 for ; Tue, 07 Apr 2020 14:46:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a+XBML6RXiddBENN94JYepbFK7Fo/Po6m/v7Xw54/iQ=; b=Sk0Re5Y1t81Z037jAu4yYmwUJnfm6Jk6/59p00JcHAXdhRvHyPn7VK6I9gxE/LZ3vs lDAVhJMfn0Tbw7ILJ0yYy0vGvwaCoYyYC0jEtZguT8N7gOxPvKqn31Un2aBJJtegzJs4 xxiAGAqqms4i5mzJBJ8Lrx+EVaBhS4UJwjIn5j67fw3/KJGh9odKfg/LXt+H9ISFn7JY rGOELfzxH7H27pmbDTfLSKKxCTut3HQ20UBUH4sUiwCmJ+W+vGyqzqTvIOxNLPTz/UK2 BYDNJT3A4TrbHvSEhBEAcgxgBlDyieh1Lxln1K7nRpgaK3LdZM0YbYHPPt82pg3awYJy nsUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a+XBML6RXiddBENN94JYepbFK7Fo/Po6m/v7Xw54/iQ=; b=GQ+NGBWuPf1RLrZQxzZqxjKnJNYqIGJrmClZBEYVqYVi9d3sO+tSDvwoyyN8EYwvFN NPIJNZpggr2O1r0TXNvjTmt7DGMMEtFKDWmjV6H+L21jqFLwjsZxFqeWHWXxmDDtYbPA tCubdgnLAwzhoO/mxGbwQEhWjwZEuUwsU/AN/2wHHLTub50U0p8GQ2LJDPpRUEmuB0tY dPus7f5KRvnjByyPhZYDVI55pIUPEzLVeaaBHFQObwbfhc1548FOnphiDCg8fROOIq3V FE3jVAfEdSK/b8xwx1GLwa0B5aDm6XGVvivtjAunLMDZHIq6ej0o+qNwTkbnCVZ4BcQW PHIQ== X-Gm-Message-State: AGi0PuadpVtIy+GPk31aLOG8nY5mYdOtNKJA0vKUD5gsjgDe2mRYT/W4 mTFW43gf5MgWPeE7nuAhayarOjl5 X-Google-Smtp-Source: APiQypJ74cORfhPoeJaUwnTba/sxRKSlM339Q3CTVwq6ocBvmtgKLu/MfoDb1hwfED48UPFCy/kHeA== X-Received: by 2002:adf:d851:: with SMTP id k17mr5273422wrl.157.1586295979864; Tue, 07 Apr 2020 14:46:19 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:19 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:57 +0200 Message-Id: <20200407214603.19798-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] avformat/webmdashenc: Remove unnecessary header 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" avio_internal.h has been included in this muxer since the beginning and was never needed. Signed-off-by: Andreas Rheinhardt --- libavformat/webmdashenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 08fe976b15..401cfe52d5 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -31,7 +31,6 @@ #include #include "avformat.h" -#include "avio_internal.h" #include "matroska.h" #include "libavutil/avstring.h" From patchwork Tue Apr 7 21:45:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18765 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0DAB844AF3F for ; Wed, 8 Apr 2020 00:46:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA0D768B6E4; Wed, 8 Apr 2020 00:46:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7DC868B6B2 for ; Wed, 8 Apr 2020 00:46:21 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id h15so5562854wrx.9 for ; Tue, 07 Apr 2020 14:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uCwjzaHaRDweM8PhkhA+JrD2eeLQxkE66TFriYMkTYA=; b=ivOXYJz1QSypWT19aWM6PMhJNrYvkEzkwgHz5m/C5zXZjeD9qlVNezuyh2bh8OASMN RlpuzftuhPxm41+QI1mzaGLs/q0FezZmwk+WdldbuUbQbeRfJYBO92UEPC0AV6GS0eP5 qoVcWIdP1RY0o1cv8swohrxWho2LpoFtFvsnBVTwejJRjSxiFdiPknppg18YIbfxrnXD J9WUvbLBq05G6yWJgCgIQgVKqfvjI4IfHUrURQo9oKDcZLJPtz9OmYclruEa2bsY+DTa Gr3gP3YzKBouUB/np7wzMgMixFC2Hxvs5CK9RM5vZK2e2hfhH+22rSCtaAjZUEH4Hi4V DHEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uCwjzaHaRDweM8PhkhA+JrD2eeLQxkE66TFriYMkTYA=; b=EkPSovNg6HDUk+NHEog2oJQKROYPgcnyTvAMQvtEvfMexlQt84e6QfqLdGJgpE4oD0 eca/O/i38toW2o7lqg8w0yDrLsuhXtrWBjvOkRkAycXSX4MGcBX4LzR+uxQ8WwTp8W1L AhXLPyGquENfsp9V/MP/jM9tkozLovopexJn0UOiw3ch0XSlzSj4efbt32FwJ6qH6k3t tgRt7/rzBlXjCLH2e7hnAXpfcjbYWcp+9vrCiuli+GWgk0TNXRl4TukmoNXBiuGzAoD9 ln7/EL8N9NloOTO2dWwGXclsNvHNulutof0Z3YpP8oDdNhJX2ojp5HL7Felkfhbo6zCm xItQ== X-Gm-Message-State: AGi0PuYBJ/Gxl0yQ3892WKZpsHCPULFSL6K37HYr85HBsERfvGS5k7R7 iNSJV2fCiyAZJsPwQJpQepuplAep X-Google-Smtp-Source: APiQypLn5ws9Y8Q6imnr2/bgS4lATuSRtxb2lzbfsvAELMiS2zQwd7JN09pVJZb61G3XGhNV7qpTtg== X-Received: by 2002:adf:f5c5:: with SMTP id k5mr4692148wrp.403.1586295980982; Tue, 07 Apr 2020 14:46:20 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:20 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:58 +0200 Message-Id: <20200407214603.19798-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] avformat/Makefile: Remove false dependency of WebM DASH manifest muxer 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It does not use anything from libavformat/matroska.c. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index f72fa6fb1a..b34e5bc3ce 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -554,7 +554,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ flacenc_header.o avlanguage.o \ wv.o vorbiscomment.o \ webmdashenc.o webm_chunk.o -OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o matroska.o +OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o From patchwork Tue Apr 7 21:45:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18767 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DC00744AF3F for ; Wed, 8 Apr 2020 00:46:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFDC868B6DA; Wed, 8 Apr 2020 00:46:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28FA068B6D0 for ; Wed, 8 Apr 2020 00:46:23 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id v5so5521234wrp.12 for ; Tue, 07 Apr 2020 14:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ATgsfRlen7Eo6ukCHIXIBeI9ME80dd1oTtaOx/wLXk4=; b=dsVNs0hTKPLRjMaRnfCJfoqKBarDmLl0uIiVhHtNvOXCJhxquek642F1BJ+BfUz8ti 5F24zoESiCYpGXrArH+x3FRLEXMQ5dJINX7Z4yppO1Ogivq4eRDygsceeO21K8W7aYFl 5inde4/1hzOZCYnUuQYVLmA9XhyLOHvNI6JX1SYRzwR5ZHEbiK22Y+O0rYDrGkAFvsKY bK9fHxBpkW+NK5v65JALBl+/NPKZsnOvwnu+iwoxbpj9AfwuYRq3zX4zhb/mzKFcaPMl 3HoPD6HVaFXYYzaxehRuthgI4jQNNYlpOKWB/LKzqk3dTvRa18elnlmQhrzVlRSyyacW fjcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ATgsfRlen7Eo6ukCHIXIBeI9ME80dd1oTtaOx/wLXk4=; b=F+MSi4xGMb4juu32LsIVlWVhCTlzn5mZPNtSH9CbqHqA2lTTykzXoyHosRNHO6M5G4 hOVDItHcnOsB6sMQPLRdLzbx5tgqqf1SYbC+ieRjA2Fm/EtibQxJDf0Q54uxo2rHyoel rMiZjtXpSmVi7xacIcYQk61rLb2EWn0chFWJ0vucTuuvC7LDsmpr1e+jlCuKFEBfJWiN 2Zjl80kYmZjX0lYX3raT3R/hY88RIXiYRxqhWFrX1YbeV3AI6mLLAXSdqKYmPC6k2VVb PPUIS9Ffyo4ad0wAA+QxlZ0CSnNpw8P+C8VFG1oX3vm1PIa6YQs6RoC6SfBPY+1OcuHX peww== X-Gm-Message-State: AGi0PuZan/MSUCJktd/dBjNKhb1ZVXGAWY6zQ6NoifdcjH7gfqi8DJw7 IeCfZZn007AU0flSsfU436IVsVL0 X-Google-Smtp-Source: APiQypI7xct5pXaK+ufEZTU/dTJENK/guy/TlYfNbPHYuYl0bCZsRswEg1KIw72Texo4KR51NrCGFg== X-Received: by 2002:a5d:6104:: with SMTP id v4mr5195557wrt.213.1586295982106; Tue, 07 Apr 2020 14:46:22 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:59 +0200 Message-Id: <20200407214603.19798-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/10] avformat/Makefile: Remove false dependencies of WebM and Matroska muxer 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These muxers don't depend on the WebM Chunk or the WebM DASH Manifest muxers. Furthermore, remove some #if checks in webm_chunk.c and webmdashenc.c. They are always true now that webm_chunk.c and webmdashenc.c are only compiled when their corresponding muxers are enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 7 +++---- libavformat/webm_chunk.c | 2 -- libavformat/webmdashenc.c | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index b34e5bc3ce..eab8fe5c49 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -300,8 +300,8 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ flac_picture.o replaygain.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ - flacenc_header.o avlanguage.o vorbiscomment.o wv.o \ - webmdashenc.o webm_chunk.o + flacenc_header.o avlanguage.o \ + vorbiscomment.o wv.o OBJS-$(CONFIG_MD5_MUXER) += hashenc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o @@ -552,8 +552,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ flacenc_header.o avlanguage.o \ - wv.o vorbiscomment.o \ - webmdashenc.o webm_chunk.o + wv.o vorbiscomment.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index f079c5c65e..1749509975 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -284,7 +284,6 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_WEBM_CHUNK_MUXER static const AVClass webm_chunk_class = { .class_name = "WebM Chunk Muxer", .item_name = av_default_item_name, @@ -307,4 +306,3 @@ AVOutputFormat ff_webm_chunk_muxer = { .deinit = webm_chunk_deinit, .priv_class = &webm_chunk_class, }; -#endif diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 401cfe52d5..465485c90c 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -559,7 +559,6 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_WEBM_DASH_MANIFEST_MUXER static const AVClass webm_dash_class = { .class_name = "WebM DASH Manifest muxer", .item_name = av_default_item_name, @@ -577,4 +576,3 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { .write_packet = webm_dash_manifest_write_packet, .priv_class = &webm_dash_class, }; -#endif From patchwork Tue Apr 7 21:46:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18768 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9A54B44AF3F for ; Wed, 8 Apr 2020 00:46:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D35868B6EE; Wed, 8 Apr 2020 00:46:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C7D768B6B0 for ; Wed, 8 Apr 2020 00:46:24 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id c15so5521269wro.11 for ; Tue, 07 Apr 2020 14:46:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y71Za4hK9l5ST0JAYlNAwPdhfeI2G314GzrXdBM3x/0=; b=iAWlqYv5sOb/nv91XpIBe9Cj/LxmO8xDy4hIObyOVmXUYnYM6GY0JfC4uicWApbhiP QR8wGV1M14uFw8xy+niBw/lm6X6oOfq6VqOhJ8m/N9ryo0UCHpmnDie5WCmt+T1d3j0S +CYANmU6QzIxwmXzqNWfdI974UlQJE3S4bJhw2yaKAq8dRHwisOjzT3NSJTr7h9koL7m lw2x95kubxMF+cYPnkX2yD0RP3zletT/YV5pePSCBctktmpcyamlwDnFtKVA0A7s8V0j uiZhSu+YWjGczT7X23htmtIpxxBK5ISXi/dXI2j04cCMNbRy7+aCsDwnOKTPIHVp+0Z/ i0CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y71Za4hK9l5ST0JAYlNAwPdhfeI2G314GzrXdBM3x/0=; b=DLvPHWfOCWG/yT+GT/0BRe52dpzNnFlMb7rWAghjX7OEzqlUm9QkYZ9pMM4kcbQqhZ gucIwoOzlJgOCP5ljWmBKeBsgideOcLAxcpSM4q0feT65LY/x0dw0kSRYBQkbBOBMEXw uxIXdCnwoLFg1B1QxKhAqbig253zBir6wEnuWALYD2UPoP7gi+QhjTJ81AW/ATtNzhPi gbrr2J2+1eZCXTl4PjTe+qlLxF8Tffl9UbTcoyw/oG+r+XkaEe2XFhQYInPXDzEGY61H 8Q0FCEgCTJqZTN7cG/Jo6pGOJZofcWzS/mZhzUc8wUEZMAPS0LZDutn1zbJ7ooz7NlhZ GmyQ== X-Gm-Message-State: AGi0Pub/96425jA7u17R7yFWl7xMdFYgMx1aBeXNdSX9XdeRlJ0qkIEs 9X7dvm3ejwnIZo6ii5/v7l06TGDY X-Google-Smtp-Source: APiQypJgBDdJ75D+jq69VRDCZREXFDhBxo4n3JVdcLq58mjgmUHOs3r+j79hDUZgSUGA37FvzXEzew== X-Received: by 2002:a5d:410d:: with SMTP id l13mr2827211wrp.326.1586295983703; Tue, 07 Apr 2020 14:46:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:46:00 +0200 Message-Id: <20200407214603.19798-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] avformat/Makefile: Don't add dependency twice 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" as has happened with flac_picture.o and the Matroska demuxer. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index eab8fe5c49..09d5c7df4b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -297,7 +297,7 @@ OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ rmsipr.o flac_picture.o \ oggparsevorbis.o vorbiscomment.o \ - flac_picture.o replaygain.o + replaygain.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ flacenc_header.o avlanguage.o \ From patchwork Tue Apr 7 21:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18763 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1A14344AF3F for ; Wed, 8 Apr 2020 00:46:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06CFA68B6D6; Wed, 8 Apr 2020 00:46:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1C2268B6B2 for ; Wed, 8 Apr 2020 00:46:25 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id g3so5601258wrx.2 for ; Tue, 07 Apr 2020 14:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=avIwyK79L1N/7VV1aaKJ9+NcBmGHxUu2vrJ0ayIAGaU=; b=aoL88IZLBGTsGeUOLUAhOBZwJ4JbhJIfCm0u2ai4WG4fUoyXaQMONW4XAbpd7MwqoA Uald8CFjz+WH9yL8xU1KO4Q/vEaRcdqbD5ANuS52uFY29/Lih2xxeCfMibcF+HwjLsIU mHYTNNV2Nl5Widwetc3yr0OFP2wKFLEZKpJIVXsrFkmqZyrksUpkJzyB6YTwjCNrc1U4 ycgSdWXZV03EOublZ9fjUoLcjGHaOKzmrrgni03bcZHz3NeebgRCnYTnRRiXDHVYoYZy v6pGKZgj73Iy6PTFjNiWJfJJsadukfNvOURqNRq86d9f1nt5HvmVxpojVGiQVbir4Y3n wvWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=avIwyK79L1N/7VV1aaKJ9+NcBmGHxUu2vrJ0ayIAGaU=; b=BRm0nx52LOEG0ioJGDk9wO3qnjty0nAvaSwggIR3DOQxj93OESXceO7q/aoGh1jVgf 7bHmVzf/caNfDF4UVqt+O1c9PI92ZmmQgN+v0ZRwQsKPpBjWn8PU8BLXZz2fZPVW1gFe By5O1K5Na4n5+pk0ORep8V5+45VABm3PhWgYh5/2G098jbHybCY+1UDsYLxcjBGxxq/0 Yqw/mFVf0MJqAiCWe1+aPXCV6dyTJLM/7mcRgoEohpypOCc9IQeTC6BSG9N/Ek/ZYrbM 2vMF38Q5axWjfkD7dMafaS83c600nbcr4wA9pa1ce3cDdxWxC+iZTSCk++b9lt7l3uxf dEVw== X-Gm-Message-State: AGi0PuZELehm6Sd8N/5DdIScuco8oCwRXNai8LqJrZR0nd8U4EeEN6bm i+UWTGk9skrMW3djyza6aKVIWg6H X-Google-Smtp-Source: APiQypLiIpLWDjNv1qGHk/UML9cCjgNj/nfawp32Am04F2J1B4voe0fsLa/dFKwvjYhXIE07bEkFvQ== X-Received: by 2002:adf:d4ce:: with SMTP id w14mr4964998wrk.135.1586295984902; Tue, 07 Apr 2020 14:46:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:46:01 +0200 Message-Id: <20200407214603.19798-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] avformat/amr: Don't reimplement ff_raw_write_packet() 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- libavformat/amr.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 09d5c7df4b..850f250b80 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -87,7 +87,7 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o -OBJS-$(CONFIG_AMR_MUXER) += amr.o +OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o diff --git a/libavformat/amr.c b/libavformat/amr.c index b8a5debb16..e4f8e4d860 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -29,6 +29,7 @@ Only mono files are supported. #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" +#include "rawenc.h" typedef struct { uint64_t cumulated_size; @@ -62,12 +63,6 @@ static int amr_write_header(AVFormatContext *s) } return 0; } - -static int amr_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - avio_write(s->pb, pkt->data, pkt->size); - return 0; -} #endif /* CONFIG_AMR_MUXER */ static int amr_probe(const AVProbeData *p) @@ -296,7 +291,7 @@ AVOutputFormat ff_amr_muxer = { .audio_codec = AV_CODEC_ID_AMR_NB, .video_codec = AV_CODEC_ID_NONE, .write_header = amr_write_header, - .write_packet = amr_write_packet, + .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; #endif From patchwork Tue Apr 7 21:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18764 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0F97D44AF3F for ; Wed, 8 Apr 2020 00:46:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEAF468B6C7; Wed, 8 Apr 2020 00:46:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D37B768B5F3 for ; Wed, 8 Apr 2020 00:46:26 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id s8so5552370wrt.7 for ; Tue, 07 Apr 2020 14:46:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MkZVzQ3hMzc5P6bPFI1syKsW2nAFxqcu7sHt6+jKffc=; b=RyMBFIi83gFA1BBGTXn1TKKxVYzbCZJ01y+5pUKhSWY5RPo3RwTEt+Ylel5DoPhFQz njTlWCAe3CnprGLSUFWBAK2I172JloGTt7gteFT9HpZ+AjDjU6O/0v8V7u8/2ovaAVSp X3J3h4R3ziM0YG9y8BSD345Rrkda/Tjtnvlft0ICocE0edlfSb5nKLoXkMs/n7sBkS2/ 5pYIzhWWS0bBuv7PahGRvdTAqYV7Mk0kjiPcpaEV84IX08SqgoC+UmCFHnD1xf+l3HgY jlscgclWgZMJFiMMMFle0CrljGFWo9+1i2qFjit56HEpDJAalGZwwiseJjIrCbdSSjLq c1hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MkZVzQ3hMzc5P6bPFI1syKsW2nAFxqcu7sHt6+jKffc=; b=BNxh+YGwWn3aNqxKQ/X/UhZvIWiRPDlWkI8z06wamw837pvDUg8Hk1OuHhO5UqgQ76 rorliHihPuOoVXc5a77xM9inuYX1Bv0G5w/sjsAWmB2aXcfnd7w7S+ZXh/vwXWGhVlg9 nHeRM+JJmz+LXo1jajHT3PD+m0OKRU43RBxmO2Y/SFdt08ZymEBbvDjEfBzC8Qc4LLvd 28hcW/3sXlHM2swwpm84rkuBkQRzNbCmCAyld0VXjpZiaJeWeGkKsw0c1+gqHs8PyxJL 4Tu6zzFIsV1mEaiWRN3Ciq+R4WhB+C4FSupJylXUiai4UP4c2kl8kasvPugOkevSI6DY jsyw== X-Gm-Message-State: AGi0PuaYd/UPaXEZ2GGL/cgjuzcu+tM87COfFXvqpiN2pLxWBwXYmCTr dqqA8hZCGCqqk4S32bbAgQorVS6c X-Google-Smtp-Source: APiQypICGMxFO3wJL0/Nbsrxrik9v/tC7tF7ZCBK4oMQmWUZjAhjJi+aJqmiIqbY2YSMlB/2ysZ2CA== X-Received: by 2002:adf:f808:: with SMTP id s8mr5214436wrp.219.1586295985881; Tue, 07 Apr 2020 14:46:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:46:02 +0200 Message-Id: <20200407214603.19798-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] avformat/rso: Don't reimplement ff_raw_write_packet() 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- libavformat/rsoenc.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 850f250b80..554b0bfbf8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -444,7 +444,7 @@ OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o OBJS-$(CONFIG_RSD_DEMUXER) += rsd.o OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o pcm.o -OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o +OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o rawenc.o OBJS-$(CONFIG_RTP_MPEGTS_MUXER) += rtpenc_mpegts.o OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_aac.o \ diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index 3159f0c427..beba94b2a7 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -22,6 +22,7 @@ #include "avformat.h" #include "internal.h" +#include "rawenc.h" #include "riff.h" #include "rso.h" @@ -63,12 +64,6 @@ static int rso_write_header(AVFormatContext *s) return 0; } -static int rso_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - avio_write(s->pb, pkt->data, pkt->size); - return 0; -} - static int rso_write_trailer(AVFormatContext *s) { AVIOContext *pb = s->pb; @@ -103,7 +98,7 @@ AVOutputFormat ff_rso_muxer = { .audio_codec = AV_CODEC_ID_PCM_U8, .video_codec = AV_CODEC_ID_NONE, .write_header = rso_write_header, - .write_packet = rso_write_packet, + .write_packet = ff_raw_write_packet, .write_trailer = rso_write_trailer, .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, .flags = AVFMT_NOTIMESTAMPS, From patchwork Tue Apr 7 21:46:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18766 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 20A4044AF3F for ; Wed, 8 Apr 2020 00:46:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A47968B6E3; Wed, 8 Apr 2020 00:46:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB1A168B6CD for ; Wed, 8 Apr 2020 00:46:27 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id c15so5521394wro.11 for ; Tue, 07 Apr 2020 14:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2k2rmroLB+aEKrOmJKwb/CZWwTwMtLHmKnlUzdybc6k=; b=OGyLVF2ooS6q3OaX/KSOi5ZNXmTzS0SqRJh0kQ/lcQlUnuVm8K17aBpU+hwQgQaHcr 1PniXcRoAnIkZLyST+gWhlTXRfdPnLUQ/AMBCmAYk5/XqkVcse1PHmRgHSoRGApl9+4A dmOx0puCWvwFo897BjgZz7sJxJskaTI+1tX4Dk7QGIuM1L84sHxDK5P1deXvWKDI32y8 3D30/mha6jAUY2BRRdWm/kEzmnMa9sfMWlUa/uXpiyabVKREXuW0wkC3CRukWc+RihRo 0lBGvWM80iMIraUiUkg+iAQYRqK2Lb6Xjtb/KI+HxWV40ZC/N9tnJxhtYPEyzLor0rty ePOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2k2rmroLB+aEKrOmJKwb/CZWwTwMtLHmKnlUzdybc6k=; b=KBGCJaL9i00tHyVZ2GUIOPIsDQCQiAN+E3sqzzUhiWuSezBnkH6UidSt1b9/tcpzoY wMBmNQE2Ue3S6DxrvivYHj2hh3kpqrhJJNkA0B9srN4IIFHWsa2zXsiyjcD8ymbif90h 1h/9BTnxs96tdpYG/kRbJgoAN8f0JZWTd5IIypRFKztYKmJ5er6Q9HI2096g+KR14+UI p9wEwtecHuHlFS79b6+q4P7xcuT5K38G3R8pUhh7PLYfS02pQsIRKfMD34JPoSi5HIri pS/MGKiTCxDjW3hc1j+co9qW+2qwWewt2UAFg7IFDvxq/Qt1rrFIvFa6zMsBwc6wi6bs g+wQ== X-Gm-Message-State: AGi0PubhNIdjavHD8zfyT14aYJbJzXSbl4fH59bSGxdDlCiVyqbQe9sm f3miQehG23qHYy83Cl8rwVqIkCWX X-Google-Smtp-Source: APiQypKnpFyX7KIGDV9rYRNICK9LkG5hz7tMN7Bb6mlD3nCIo/gJR8QfmL0Kv+36cElKIImhzgZDRw== X-Received: by 2002:a5d:6788:: with SMTP id v8mr5278171wru.149.1586295986904; Tue, 07 Apr 2020 14:46:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:46:03 +0200 Message-Id: <20200407214603.19798-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/filmstripenc: Use ff_raw_write_packet() 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The only difference of the currently used write_packet()-function to ff_raw_write_packet() is that the former also counts the number of frames. Yet doing so in the muxer itself is unnecessary as this is already done generically in write_packet() in libavformat/mux.c. Signed-off-by: Andreas Rheinhardt --- Note: The generic counter is only incremented when no write error happens. I doubt it matters. libavformat/Makefile | 2 +- libavformat/filmstripenc.c | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 554b0bfbf8..d4bed3c113 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -179,7 +179,7 @@ OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o OBJS-$(CONFIG_FIFO_MUXER) += fifo.o OBJS-$(CONFIG_FIFO_TEST_MUXER) += fifo_test.o OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o -OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o +OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o rawenc.o OBJS-$(CONFIG_FITS_DEMUXER) += fitsdec.o OBJS-$(CONFIG_FITS_MUXER) += fitsenc.o OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \ diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c index 8ead696360..83faf29556 100644 --- a/libavformat/filmstripenc.c +++ b/libavformat/filmstripenc.c @@ -26,13 +26,10 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "rawenc.h" #define RAND_TAG MKBETAG('R','a','n','d') -typedef struct FilmstripMuxContext { - int nb_frames; -} FilmstripMuxContext; - static int write_header(AVFormatContext *s) { if (s->streams[0]->codecpar->format != AV_PIX_FMT_RGBA) { @@ -42,23 +39,14 @@ static int write_header(AVFormatContext *s) return 0; } -static int write_packet(AVFormatContext *s, AVPacket *pkt) -{ - FilmstripMuxContext *film = s->priv_data; - avio_write(s->pb, pkt->data, pkt->size); - film->nb_frames++; - return 0; -} - static int write_trailer(AVFormatContext *s) { - FilmstripMuxContext *film = s->priv_data; AVIOContext *pb = s->pb; AVStream *st = s->streams[0]; int i; avio_wb32(pb, RAND_TAG); - avio_wb32(pb, film->nb_frames); + avio_wb32(pb, st->nb_frames); avio_wb16(pb, 0); // packing method avio_wb16(pb, 0); // reserved avio_wb16(pb, st->codecpar->width); @@ -76,10 +64,9 @@ AVOutputFormat ff_filmstrip_muxer = { .name = "filmstrip", .long_name = NULL_IF_CONFIG_SMALL("Adobe Filmstrip"), .extensions = "flm", - .priv_data_size = sizeof(FilmstripMuxContext), .audio_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = write_header, - .write_packet = write_packet, + .write_packet = ff_raw_write_packet, .write_trailer = write_trailer, };