From patchwork Sun Feb 26 11:04:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2683 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp572439vsf; Sun, 26 Feb 2017 03:12:21 -0800 (PST) X-Received: by 10.28.137.211 with SMTP id l202mr8950546wmd.88.1488107541784; Sun, 26 Feb 2017 03:12:21 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p198si8035709wmd.96.2017.02.26.03.12.21; Sun, 26 Feb 2017 03:12:21 -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=@gmail.com; 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=NONE 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 D2823688262; Sun, 26 Feb 2017 13:11:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF9CA680C89 for ; Sun, 26 Feb 2017 13:11:52 +0200 (EET) Received: by mail-qk0-f195.google.com with SMTP id s186so10793335qkb.1 for ; Sun, 26 Feb 2017 03:12:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=eXn9cHZV+qPRWZurfAzcnEoYYQRkidTu4VGFNDp6c1s=; b=NiFIF2XTZJeE2gE/nui9qOS1qHOhpw/0NYDjfDX0cqsVo8BQeW7lqQ06NJDIu359ed gDBspKL7en7LrPmxvUow0R0UyacXr+Wj9H4GIkVyFBQUx71bBZvp+wYGSqpW31ALwOfQ g1jSw5Loo5gr8mkVsC8y3lqgpDz6fC45ICLXuuJTtKdtmh8MSCRuriG1jU1M96eaxAGv /bAMvO53f7/8yADnjXgsEYLw3Yo+7LoJxbnRltxvGE9IT9rF2rOIFzSB8lfmrB68oF9O aFcmzHhrlRtll6bIJShtvKfUQ5SbOYFLhLSjP2sdlDwSHDYPsH6n6WFDz5wIXAIxmIyW zyVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=eXn9cHZV+qPRWZurfAzcnEoYYQRkidTu4VGFNDp6c1s=; b=ATgLHr/WhgSfw7yGRimT3Iot6+DcpuDECMGe6T3fPqfZMsqCHsx+6IurPY43cCAscO bAwJgVuM+caeRvY1E0N8BEi0rpb0JU65OFLjZMG7UQhg4emQlCglKKJl5oCa+VH9VlSD 2+4RO6C5N8umsPjZnOQqzjJLc2zZfmhReJnu3M4G5GW997nQMbgiZEiEKoGtAVIYIgJs 1mYfZJ/HA2a7jufGJNlX9ih957PqzhSKtEt5WFbU5fVC9s1pOaX40r/ZeSu+QIopV42L bhD4NZYI/lRFs7cCY8YsGeWPBrr8CA0kBBO5jxpT+nPyK3WAA3kKhMdwrKkuhqHzGCVu OKlQ== X-Gm-Message-State: AMke39l4qQoZ5kGKxO/RZ9l/U8Icesdo3UpiD04AxmPJ0Yab6xnI3wTUwn+cbfCDG7wuSG+m+3gTcwjPMySN5A== X-Received: by 10.200.37.199 with SMTP id f7mr11196606qtf.186.1488107070506; Sun, 26 Feb 2017 03:04:30 -0800 (PST) MIME-Version: 1.0 Received: by 10.12.172.221 with HTTP; Sun, 26 Feb 2017 03:04:09 -0800 (PST) In-Reply-To: <20170226105130.GA1413079@phare.normalesup.org> References: <201702261146.05282.cehoyos@ag.or.at> <20170226105130.GA1413079@phare.normalesup.org> From: Carl Eugen Hoyos Date: Sun, 26 Feb 2017 12:04:09 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavc/avpacket: Make pkt parameter of av_packet_get_side_data() const 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2017-02-26 11:51 GMT+01:00 Nicolas George : > L'octidi 8 ventôse, an CCXXV, Carl Eugen Hoyos a écrit : >> Hi! >> >> I believe adding const to the declaration of av_packet_get_side_data() >> better reflects its intention, also fixes a warning. >> >> Please comment, Carl Eugen > >> From a17c4bab8cd21c15e91f5efd03d5900eda29090b Mon Sep 17 00:00:00 2001 >> From: Carl Eugen Hoyos >> Date: Sun, 26 Feb 2017 11:39:07 +0100 >> Subject: [PATCH] lavc/avpacket: Make pkt parameter of >> av_packet_get_side_data() const. >> MIME-Version: 1.0 >> Content-Type: text/plain; charset=UTF-8 >> Content-Transfer-Encoding: 8bit >> >> Reflects the actual code and silences a gcc warning: > >> libavcodec/utils.c:2102:36: warning: passing argument 1 of ???av_packet_get_side_data??? discards ???const??? qualifier from pointer target type [-Wdiscarded-qualifiers] > > You have an encoding problem, probably UTF-8 related, in your > copy-paste. I suggest you re-run gcc with LC_CTYPE=C to get the error > message in plain ASCII. Thanks for noticing, not reproducible on the web interface: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=560f5188 Same issue for 3aef2fce > Also, lines in commit messages are usually better wrapped around 64-70 > characters. I would prefer not to wrap gcc output. >> --- >> libavcodec/avcodec.h | 6 +++++- >> libavcodec/avpacket.c | 6 +++++- >> libavcodec/version.h | 3 +++ >> 3 files changed, 13 insertions(+), 2 deletions(-) >> >> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h >> index 925a8c7..b065309 100644 >> --- a/libavcodec/avcodec.h >> +++ b/libavcodec/avcodec.h >> @@ -4563,7 +4563,11 @@ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, >> * @param size pointer for side information size to store (optional) >> * @return pointer to data if present or NULL otherwise >> */ >> -uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, > >> +uint8_t* av_packet_get_side_data( >> +#if FF_API_CONST_GET_SIDE_DATA >> +const >> +#endif >> + AVPacket *pkt, enum AVPacketSideDataType type, > > I do not think we need the FF_API dance, since it is not an ABI break. I agree that there is no ABI break (but I suspect FF_API does not imply an ABI break). > I think is is not an API break either. I may misremember but I thought it's an API break for c++ users. Anyway, new patch attached. Thank you, Carl Eugen From 75381486fd28945d1aa0c3f4caa4f738d0bbe08e Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 26 Feb 2017 11:58:49 +0100 Subject: [PATCH] lavc/avpacket: Make pkt parameter of av_packet_get_side_data() const. Reflects the actual code and silences a gcc warning: libavcodec/utils.c:2102:36: warning: passing argument 1 of 'av_packet_get_side_data' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] --- libavcodec/avcodec.h | 2 +- libavcodec/avpacket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 925a8c7..7e9637e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4563,7 +4563,7 @@ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, * @param size pointer for side information size to store (optional) * @return pointer to data if present or NULL otherwise */ -uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, +uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type, int *size); int av_packet_merge_side_data(AVPacket *pkt); diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 8e028a2..eb570a2 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -336,7 +336,7 @@ uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, return data; } -uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, +uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type, int *size) { int i; -- 1.7.10.4