From patchwork Sun Oct 16 14:52:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1019 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp23906vsd; Sun, 16 Oct 2016 07:52:27 -0700 (PDT) X-Received: by 10.194.206.68 with SMTP id lm4mr8374659wjc.106.1476629547397; Sun, 16 Oct 2016 07:52:27 -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 ff10si9262388wjb.271.2016.10.16.07.52.26; Sun, 16 Oct 2016 07:52:27 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A54E68972C; Sun, 16 Oct 2016 17:52:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CB9A689223 for ; Sun, 16 Oct 2016 17:52:16 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bvmnR-0008Pj-8h for ffmpeg-devel@ffmpeg.org; Sun, 16 Oct 2016 16:52:17 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id wEsG1t0010S5wYM01EsHFP; Sun, 16 Oct 2016 16:52:17 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 Oct 2016 16:52:10 +0200 Message-Id: <20161016145210.25762-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.10.1 Subject: [FFmpeg-devel] [PATCH] avcodec/mediacodec: Factor duplicate include 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: Michael Niedermayer --- libavcodec/mediacodec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c index a658f0e..37008e0 100644 --- a/libavcodec/mediacodec.c +++ b/libavcodec/mediacodec.c @@ -24,6 +24,8 @@ #include "libavutil/error.h" +#include "mediacodec.h" + #if CONFIG_H264_MEDIACODEC_HWACCEL #include @@ -33,7 +35,6 @@ #include "libavutil/mem.h" #include "ffjni.h" -#include "mediacodec.h" #include "mediacodecdec.h" AVMediaCodecContext *av_mediacodec_alloc_context(void) @@ -101,8 +102,6 @@ int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render) #include -#include "mediacodec.h" - AVMediaCodecContext *av_mediacodec_alloc_context(void) { return NULL;