From patchwork Wed Aug 3 04:30:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 74 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp521290vsd; Tue, 2 Aug 2016 21:30:41 -0700 (PDT) X-Received: by 10.28.0.70 with SMTP id 67mr67912146wma.88.1470198641311; Tue, 02 Aug 2016 21:30:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ss6si6104597wjb.7.2016.08.02.21.30.39; Tue, 02 Aug 2016 21:30:41 -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; 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 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 4734168A054; Wed, 3 Aug 2016 07:30:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f67.google.com (mail-oi0-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 999A968A045 for ; Wed, 3 Aug 2016 07:30:17 +0300 (EEST) Received: by mail-oi0-f67.google.com with SMTP id a135so1111086oii.1 for ; Tue, 02 Aug 2016 21:30:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=NZmnhimIIdJhT1HD5OZ6fagVGQd7ZEyVohSCOJ3zNW0=; b=AdBv2m45bn3bqW4CVBR9FXzbp19iK//ieRqJjzu1h8jFqLGyZkKpdOTBGDptjtR1he aydWj7DhxKM3/YSQgj9rLZ5R8NqHPQunfOSYh7ZLVSli8icIDiGpSsQ66fLmuwA8er0h HcB5SoDiMSDP+FymV9jAyIXKNFtp5hgjHXjimOfmaokSB33C9Dk2B8hyHYymeUVErpWF IVpiw+aFQYL4cRmOkbzPCgMcQPZ9El59RYSQS+aT9s+h+jza2WWgDBiP+w3MDCp28soe VZNv9sEEsVObNkknNqojaEs7HdQY3fv61CcwT3tHisAk0HDGTI/+bOU1/U8RY+IDlk8m qF1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=NZmnhimIIdJhT1HD5OZ6fagVGQd7ZEyVohSCOJ3zNW0=; b=dsKo3fkVsZw0ZnXmF5pRZLKn6n13itdJmAaCCnaDI7M160nN197UWqBffJpPswyJv4 GSnoVP3rjkFsYiTMGGmQRkRUW7N+DnGPqkBXoCC9ezLAWzW9OXgXctbA2leF6smt8+0W RX+ypTqQarbXV5bzh7FyqyX+n5vO2q+QiYOevaHp8qpd4pyASX6fiavAXwwoEiYUVyJX 68utTIkLCHCpDf0IqOL9nOy+Cf+/97hSumJFF/xZYnMG8FWm6cskrxWsNEV6ucFVlPn8 b3iyoIMuWDSg3vRpQoFL/x/4T/3wc1G9ZMV6rL3w0Z6OiTs+V+YTFSHT3U53XrKeprA2 Eupw== X-Gm-Message-State: AEkoouuD0VBQxaaoUYghgzKtfuQlsvLc1fuNPUd+Vt1QEfEFZMD96U9HMVtd7HxOYRXDLQ== X-Received: by 10.157.41.184 with SMTP id n53mr38431164otb.68.1470198622233; Tue, 02 Aug 2016 21:30:22 -0700 (PDT) Received: from localhost.localdomain ([181.22.17.94]) by smtp.gmail.com with ESMTPSA id n39sm2983984otn.10.2016.08.02.21.30.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Aug 2016 21:30:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2016 01:30:01 -0300 Message-Id: <20160803043001.4684-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH] avcodec/vdpau: clean up vdpau_internal.h 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" Also don't include it on files that don't need it. This reduces differences with libav Signed-off-by: James Almer --- Untested with VDPAU enabled. libavcodec/mpeg12.c | 1 - libavcodec/svq3.c | 1 - libavcodec/vdpau_internal.h | 10 +--------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 7c14052..a61d45b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -39,7 +39,6 @@ #include "mpeg12data.h" #include "mpegvideodata.h" #include "bytestream.h" -#include "vdpau_internal.h" #include "thread.h" uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 223819f..bb4508c 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -53,7 +53,6 @@ #include "mathops.h" #include "rectangle.h" #include "tpeldsp.h" -#include "vdpau_internal.h" #if CONFIG_ZLIB #include diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 8a63733..77800af 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -24,15 +24,13 @@ #ifndef AVCODEC_VDPAU_INTERNAL_H #define AVCODEC_VDPAU_INTERNAL_H -#include "config.h" #include -#if CONFIG_VDPAU #include -#endif #include "libavutil/frame.h" #include "avcodec.h" +#include "vdpau.h" /** Extract VdpVideoSurface from an AVFrame */ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic) @@ -40,8 +38,6 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic) return (uintptr_t)pic->data[3]; } -struct vdpau_picture_context; -#if CONFIG_VDPAU union VDPAUPictureInfo { VdpPictureInfoH264 h264; VdpPictureInfoMPEG1Or2 mpeg; @@ -55,8 +51,6 @@ union VDPAUPictureInfo { #endif }; -#include "vdpau.h" - typedef struct VDPAUHWContext { AVVDPAUContext context; VdpDevice device; @@ -114,8 +108,6 @@ struct vdpau_picture_context { int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile, int level); -#endif //CONFIG_VDPAU - int ff_vdpau_common_uninit(AVCodecContext *avctx); int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,