From patchwork Sat Mar 24 21:11:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8142 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1892547jad; Sat, 24 Mar 2018 14:12:23 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/FvrTLR5CpjyQfWGFbsZzNAsW01s+0VKw1eyaJe9W7k9EqlSVYB4orvmqk/n2z68bHxQgX X-Received: by 10.223.190.142 with SMTP id i14mr13668wrh.168.1521925943459; Sat, 24 Mar 2018 14:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521925943; cv=none; d=google.com; s=arc-20160816; b=Y+nkvHNHgJ8+4lGZG2Pf5NvsYV1InpxH04lYY0ZJxBM6Z8IEsaz3t+wk7V4s/p5Jkc Zwr2pN4DAhNOYWpgPI/X+Zh0+Je8RXh57o9TTGtCL/jF6YlCj/uDimofC0JFDX2nQ+JU ALYUUV/EGvbF+WWVQ+9oKwko/mBEEtpi5h4QJk/7n0Y8UJWZ8MedPQwYMqvurB9Y87TA el859bgWKq7Z6rZgcZRHw2o8b1wKJBZc+qiawM2b3HWAVBoV7AOseyzRMx9Ly0mdHTjs c8mOpf/jlZ5UHM/Lzicx1DCQerGMis0OLM5UNrK+PrwTySfjAUs+lMGfL1eiFfEw9L7f n5YQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=D/bSuKOy6OL+fSuKWXOVdkoz/doEJuDpHmPY98UBCNg=; b=SORzHvkhXSDn4FjWcltc5EKOxdbJamTcvsQwgvdTcd5BjQkJ5zCeNLJBXV/kN5KikE qxPwSupsDmt19N6KaltGrLQqN8yrvzJ0wIRssui/LtbzSU6O2WLLXU7hJcJtrcu9soCV QCZ5clS+W382XRV35w3g3rx4Kq2FHPeOm1GLizer9vSk+hk6tMtpmnuiWmkP1VAm28Xy Juuxa+R+dlDVZibaJvaZMMv/BR2lt2nRKc58OFnyraoIW5Io9HKCQnvBdXGSsq14Zmfp rK8FJRMNjzB8VjMrSPkczwRbLz2rmKfd5Au4BbJ69hV1pRrLWxRJkT6bloUc+ezylO9L Vrbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NjS03WAS; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 190si7595640wmz.248.2018.03.24.14.12.22; Sat, 24 Mar 2018 14:12:23 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=NjS03WAS; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9187689CB7; Sat, 24 Mar 2018 23:12:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 862D5680168 for ; Sat, 24 Mar 2018 23:11:58 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id w12so8454571qti.4 for ; Sat, 24 Mar 2018 14:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ALkRRgOYCcSsOrObwGymlLcEGan5f/SCnN18rJ0kO3Q=; b=NjS03WASckEP0JtnxscbBzKPZ6NPL3E/JTOL9zpugO+mB3lVkwrDvOz8JsZg+r+GE1 L1oSN5doUtb8HHf7ZJWY6HTxpUohDdJxqoPhV8o2KmArhKh3WDy9XJVZUZ9kQDzhrnP1 k3HPP9ValEzlVHpVbsd2r5BeCRxZPh7rlvGJ6VZk0H2cCG5XIV7w7jSaxNZUzhTus40c fKPlnKtpgETKV+k8T/iXAwqHxS+23MWWHMeBU07W4Y4Liboee9+rjlL6ByAz0MYYzM9r s4XAZib2/ZBUs6WEU3XUBTX5BXk2yU7CmW64Y0tJcNq01fOne2vW+437D5e6athlDFzs AoEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ALkRRgOYCcSsOrObwGymlLcEGan5f/SCnN18rJ0kO3Q=; b=our+Zt01vwAle0mVDtivu3j4i+qD6ZPUktVZdptERiFbcbfBL2FR+zoSo5XVARruWn AFDRQFTnFKgehYxlK0r1Dw7fNRN476+6JVfTpleWccUjjI8bcCU1prEs5CN8+XmMIua3 w2EUocYH8xHMoxVRNj3i9Mt94Ro1Yo1yu9zSE1pWacSjujAPUDWTMuqH1fFvY8VV5E+n BvHQOdopf+A0oHkTK0N71nGO3lB88y0fBA02frBxFrh6w8TKeTz1It5P/n5G0kHNlvsy pLNLmzBwdE90wnDLFRAgkJiYeMz83povd5YG/MvKvXGqezihl8S2nN4dNEhlECpeOuNo 0zYw== X-Gm-Message-State: AElRT7HWR+5D6AeTV8h/jyx/s32s5vv+YQ2j6xogDNzmxsqk451/qrQE KAzkdSt6uTeypQkBRbHLFd+P2g== X-Received: by 10.237.54.230 with SMTP id f93mr46806551qtb.139.1521925933369; Sat, 24 Mar 2018 14:12:13 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id x185sm8887892qke.49.2018.03.24.14.12.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 14:12:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Mar 2018 18:11:53 -0300 Message-Id: <20180324211153.2440-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avcodec/avpacket: ensure the packet is writable in av_shrink_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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- This is a good time to deprecate this function and introduce a replacement using the correct av_packet namespace and this time returning an int. What would be better int av_packet_shrink(AVPacket *pkt, int size); Or int av_packet_resize(AVPacket *pkt, int size); The latter would be a combination of both the current shrink and grow functions. libavcodec/avpacket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 0693ca6f62..7faa082395 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -100,9 +100,12 @@ int av_new_packet(AVPacket *pkt, int size) void av_shrink_packet(AVPacket *pkt, int size) { + int packet_is_writable; if (pkt->size <= size) return; pkt->size = size; + packet_is_writable = !av_packet_make_writable(pkt); + av_assert0(packet_is_writable); memset(pkt->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); }