From patchwork Tue Mar 21 14:24:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 3045 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1909599vsy; Tue, 21 Mar 2017 07:24:54 -0700 (PDT) X-Received: by 10.223.139.87 with SMTP id v23mr19635062wra.165.1490106294366; Tue, 21 Mar 2017 07:24:54 -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 b58si28017252wrb.307.2017.03.21.07.24.49; Tue, 21 Mar 2017 07:24:54 -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 3626168832B; Tue, 21 Mar 2017 16:24:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 896D768829A for ; Tue, 21 Mar 2017 16:24:21 +0200 (EET) Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 84738313; Tue, 21 Mar 2017 14:24:39 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2017 15:24:37 +0100 Message-Id: <20170321142438.16052-1-u@pkh.me> X-Mailer: git-send-email 2.12.0 Subject: [FFmpeg-devel] [PATCH] lavc/mips: fix mpegvideo.h includes (UNTESTED) 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 Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mips/blockdsp_mips.h | 3 ++- libavcodec/mips/idctdsp_mips.h | 3 ++- libavcodec/mips/me_cmp_mips.h | 2 +- libavcodec/mips/pixblockdsp_mips.h | 3 ++- libavcodec/mips/qpeldsp_mips.h | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/mips/blockdsp_mips.h b/libavcodec/mips/blockdsp_mips.h index 1742b123c3..1b3ad0f8bd 100644 --- a/libavcodec/mips/blockdsp_mips.h +++ b/libavcodec/mips/blockdsp_mips.h @@ -22,7 +22,8 @@ #ifndef AVCODEC_MIPS_BLOCKDSP_MIPS_H #define AVCODEC_MIPS_BLOCKDSP_MIPS_H -#include "../mpegvideo.h" +#include +#include void ff_fill_block16_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height); void ff_fill_block8_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height); diff --git a/libavcodec/mips/idctdsp_mips.h b/libavcodec/mips/idctdsp_mips.h index 19267e6705..6a78febacf 100644 --- a/libavcodec/mips/idctdsp_mips.h +++ b/libavcodec/mips/idctdsp_mips.h @@ -22,7 +22,8 @@ #ifndef AVCODEC_MIPS_IDCTDSP_MIPS_H #define AVCODEC_MIPS_IDCTDSP_MIPS_H -#include "../mpegvideo.h" +#include +#include void ff_put_pixels_clamped_msa(const int16_t *block, uint8_t *av_restrict pixels, diff --git a/libavcodec/mips/me_cmp_mips.h b/libavcodec/mips/me_cmp_mips.h index e0d0f51af8..0de7429f48 100644 --- a/libavcodec/mips/me_cmp_mips.h +++ b/libavcodec/mips/me_cmp_mips.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_MIPS_ME_CMP_MIPS_H #define AVCODEC_MIPS_ME_CMP_MIPS_H -#include "../mpegvideo.h" +#include "libavcodec/mpegvideo.h" #include "libavcodec/bit_depth_template.c" int ff_hadamard8_diff8x8_msa(MpegEncContext *s, uint8_t *dst, uint8_t *src, diff --git a/libavcodec/mips/pixblockdsp_mips.h b/libavcodec/mips/pixblockdsp_mips.h index a12b1a6949..004e89e914 100644 --- a/libavcodec/mips/pixblockdsp_mips.h +++ b/libavcodec/mips/pixblockdsp_mips.h @@ -22,7 +22,8 @@ #ifndef AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H #define AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H -#include "../mpegvideo.h" +#include +#include void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1, const uint8_t *src2, ptrdiff_t stride); diff --git a/libavcodec/mips/qpeldsp_mips.h b/libavcodec/mips/qpeldsp_mips.h index 704d221331..c7464aab11 100644 --- a/libavcodec/mips/qpeldsp_mips.h +++ b/libavcodec/mips/qpeldsp_mips.h @@ -21,7 +21,8 @@ #ifndef AVCODEC_MIPS_QPELDSP_MIPS_H #define AVCODEC_MIPS_QPELDSP_MIPS_H -#include "../mpegvideo.h" +#include +#include void ff_copy_8x8_msa(uint8_t *dst, const uint8_t *src, ptrdiff_t stride); void ff_copy_16x16_msa(uint8_t *dst, const uint8_t *src, ptrdiff_t stride);