From patchwork Thu Apr 2 17:17:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18579 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 8FD61448F27 for ; Thu, 2 Apr 2020 20:17:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 663D1689D84; Thu, 2 Apr 2020 20:17:57 +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 5325A689CE9 for ; Thu, 2 Apr 2020 20:17:51 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id 31so5180768wrs.3 for ; Thu, 02 Apr 2020 10:17:51 -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=rnM4cx6AGl3JlAAC5kQvpKFWtK8l19gf9x8VhjnKR0o=; b=suuJAKPCPbZpLDmkGIhTG3qdJIsGv0EhM1ESNWW1doYxbXy7A0cBKb+FS+Z9wyrQ7j O6M2b4KRwzmZpa9LV+EINMH3E9c4/AjPuZc57VOBk1K5XY/ixxzlr9DE4Q6gfOyK8nOC OfgsKIxLRmPkSxm+MsChZHsFMOT6AVqpjGSwirQ55t6ZiXDm6Go89dh0Ds/pWGzMssq2 sutV1HHtI8Od5DWwncXpp3ihgC0ax66vy6/7akL1ggOCG/y2tfsAqx2vscuYCHGdLAnq HrfiS6f5cYLxXQSuJ9ZrM30oCEk4xBN5TfiWiHLgEI/mukVI/TwylWro/CAOyFRNZkaR D1wA== 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=rnM4cx6AGl3JlAAC5kQvpKFWtK8l19gf9x8VhjnKR0o=; b=TvYWHZ65oIAaRHW1jR+88AdZFHPMwyE0Hz2odEsJInLdA4TTXyHNfzYgHQXcLyEGMG vsUN7XFnO1by9/iA1HNYohh2jRA+AUN7+PG3+mUS/ep/qGil81+NRY9p9vgQSqP+Cg62 Navu9r32hpEs5kCK+oWr/LUaNRxc8GRh2zm0Ji4D4mQHjgfKh/SmWa7oSV66PS1MPq/t 6FDzBJXMsqOVFAy3RjitclKdjtZpcD2/ikO2WI+GmgoMwDCh9Ub1M0xTK6Vq+rnL4MiC 6lbMcQbETU7WOXf3bKzHejCrt4NJKh+cBAAdaYS5TOCdU35pF6vpNq7ygU8N9EfK/3Kw apyw== X-Gm-Message-State: AGi0PuZIUXZMFFWqxMgTfKmkjnsGKJVF3EQuEwk3t8Yk0XnJJxySWDtr Nm5ED/n8FHE+Qd0JdJGC8YXv99ZU X-Google-Smtp-Source: APiQypIsNksFrcM4tNcDIGjaHs71sYhgUThdBMjU9ZeImWgpe+WFJOZsvbpAVBX2qDoHkQRYyZ9inw== X-Received: by 2002:adf:a28e:: with SMTP id s14mr17061wra.208.1585847870221; Thu, 02 Apr 2020 10:17:50 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id 9sm7645173wmm.6.2020.04.02.10.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 10:17:49 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Apr 2020 19:17:38 +0200 Message-Id: <20200402171740.19121-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/ilbc: 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/ilbc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index d41027174d..c778f5a5af 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -21,6 +21,7 @@ #include "avformat.h" #include "internal.h" +#include "rawenc.h" static const char mode20_header[] = "#!iLBC20\n"; static const char mode30_header[] = "#!iLBC30\n"; @@ -52,12 +53,6 @@ static int ilbc_write_header(AVFormatContext *s) return 0; } -static int ilbc_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - avio_write(s->pb, pkt->data, pkt->size); - return 0; -} - static int ilbc_probe(const AVProbeData *p) { // Only check for "#!iLBC" which matches both formats @@ -133,6 +128,6 @@ AVOutputFormat ff_ilbc_muxer = { .extensions = "lbc", .audio_codec = AV_CODEC_ID_ILBC, .write_header = ilbc_write_header, - .write_packet = ilbc_write_packet, + .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, };