From patchwork Wed Nov 1 16:16:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5814 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp962746jah; Wed, 1 Nov 2017 09:17:21 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RU4HMeoFd6d388IAZVUJkRzY3C0cF4vu0NnhkzjSbzFICGQrMO6a50Ej7lU8ZxN+ymJVzp X-Received: by 10.28.30.151 with SMTP id e145mr611862wme.8.1509553041267; Wed, 01 Nov 2017 09:17:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509553041; cv=none; d=google.com; s=arc-20160816; b=g4Ka4Dmc1nJrKoQLOhk7XOiHaeFIXXXSeBw1n/PIC2WR8k9UXXYdZCVhXpPKb07LCH iqSP0gHY+7ZWGuoNyL3MUwe9H3RFvceS5+bw/ETo1PX83iDWGjpe0ZQaiSy6jOBXbNBg Gsk0h+Bl9EE/AZfi8AzFUPo9Ti3MoCBRHsEBn2yDywTmG56RTc9C+haeRpKyQwHnbNOI AvFnRDZGTgQh8+EnDr9Z0sFlfpoaDx771+xZqXMz1PB18WfbzGZIyjSUm0+89rSgLycc +43EkbnPw8VW0p2TgvQJg3N23g7UTlPdsgCn4zMNGNGy89nexHZ/GV4xneivhNW98pB/ VGkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=mwbhNpdnqEU2g7SG97BytNO+DpJSjJ18S/BPvdWxyq8=; b=uwB/8hXwfM77VnH0MwsPMPM8bPJOsAqd5IutiZSFs0diHLPpOQG78t/+AT92rRvYGy 5qs0DRN9Cx6zPLVozfYTDulcXkrM5ik4eWM2/OmYJs5ezLOlVwFbLE96zxUoWL+bipM/ A86/cC7ysZ16nj3J8xunhtc4pE8/dhnsivEXMJwta0UWlKP6uoXLG3QOaVXTxnvEtBzq 0FRT4YAC9LLagssegT9pksT9RQrhs/22IVthEQNxlXK3qtt966S+iUILp712YoBggaeA RGoAkne/xZDy1VFRnbR7XAjyYXhyBcfqlqng0gkUZb7p2jS0zW4z4zs4beBXKD23N9jE w2rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P5C7Bl96; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n23si854828wra.322.2017.11.01.09.17.20; Wed, 01 Nov 2017 09:17:21 -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=P5C7Bl96; 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 9500268A206; Wed, 1 Nov 2017 18:17:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2672689FCA for ; Wed, 1 Nov 2017 18:17:02 +0200 (EET) Received: by mail-io0-f170.google.com with SMTP id n137so7193079iod.6 for ; Wed, 01 Nov 2017 09:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=CIgWZN5rS/1mbeBa4zuV16MBaibfYfgJfsts5qveTZI=; b=P5C7Bl967/qbTRcShX0/gBwZligYdpPcmI09EEkPQFr0oUTw6pyHqveoXEUVTZfFXq uLZ169CSOGWn27bRqV7waGva1TmTk7Dc+yX2w/+GlqBQVgTxofi8B1GbOXp1Srpcw0Xt YmR+doRWYwZUN4nJVxAo+OM9tiyfs2QM4abJJBGPHEbMNpsiLlP+Zo+LYj6WZOmtkqhb 8yVuD/ijWrPR6RwwkANeY27hweyHb76mC+/C8TWdijghz/AZ2l0qPLyIg8+/JKZ6ZeUg yW7MtA5dLnDenwD4gTShfZkR50q8iuytxHRSH7aEOiv9/Lh76Qqp+WM1lKi3qcSwSPe+ avUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=CIgWZN5rS/1mbeBa4zuV16MBaibfYfgJfsts5qveTZI=; b=IrvMJwavwdzvDla80SdY3TB4AE0UXwXLI0IGjkNQUJFEovSonXT6sav92dsSd4cIPy omrIgYk9vXvVV5eu34HrDpiTLzGEi3Gx6YJ5gqn+9Bh2PPz+qnaVyh19GzSjQ7WFZa47 hNExKlzrCW8vKjUWDVtUD2aY4gr5+QspawvFDhZvUcO5qiKZDgkfl2It56WmAZyMaZs7 2YuTVCcIAP1FEMwHhoSDBE06yB2+0/97ptFfo4JBsDMjcWu5gF3FJhqfwm9o3YNXa9ut l3wrlNz+sim3GFV2AYpxVu/XboJljE8l0lZJFopIQxGTxpmtyGzC2ZeVGugk8rbGQHak 2hIQ== X-Gm-Message-State: AMCzsaWjfyyABM0NzT8xAiGUIoE6j/4vABYdkUv7Nm8utT5+OQ2FlZN/ Ci6yWnsfUy+khmvTpRh1MoyRxUi7PUd7l0ykKeQ= X-Received: by 10.36.185.21 with SMTP id w21mr1215418ite.35.1509553031677; Wed, 01 Nov 2017 09:17:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Wed, 1 Nov 2017 09:16:51 -0700 (PDT) From: Carl Eugen Hoyos Date: Wed, 1 Nov 2017 17:16:51 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/pcm-bluray: Do not use incompatible pointers on big-endian. 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" Hi! Attached patch silences two gcc warnings, no sample for odd channel count found. Please comment, Carl Eugen From 991b0d62b7ac005765dfe83ef6ffa63a2b7b6fae Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Nov 2017 17:14:04 +0100 Subject: [PATCH] lavc/pcm-bluray: Do not use incompatible pointers on big-endian. Fixes the following gcc warnings: libavcodec/pcm-bluray.c:172:45: warning: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type libavcodec/pcm-bluray.c:192:49: warning: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type --- libavcodec/pcm-bluray.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index 517d7b5..d723881 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -169,7 +169,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, samples *= num_source_channels; if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, buf_size); + bytestream2_get_buffer(&gb, frame->data[0], buf_size); #else do { *dst16++ = bytestream2_get_be16u(&gb); @@ -189,8 +189,9 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { do { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, avctx->channels * 2); - dst16 += avctx->channels; + uint8_t *dst = frame->data[0]; + bytestream2_get_buffer(&gb, frame->data[0], avctx->channels * 2); + dst += avctx->channels * 2; #else channel = avctx->channels; do { -- 1.7.10.4