mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-25 02:52:13 +08:00
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 944c3e196229f144e97f285f69355ddfc3f7b579 Mon Sep 17 00:00:00 2001
|
|
From: Kagami Hiiragi <kagami@genshiken.org>
|
|
Date: Mon, 17 Oct 2016 04:07:01 +0300
|
|
Subject: [PATCH] Fix compilation for FFmpeg 3+
|
|
|
|
Upstream fix: https://github.com/mpv-player/mpv/commit/dd5c87e1d7cc11be76c56ad89317194816e4344b
|
|
---
|
|
src/mpv/audio/filter/af_lavcac3enc.c | 1 -
|
|
src/mpv/audio/filter/af_lavrresample.c | 1 -
|
|
src/mpv/audio/out/ao_lavc.c | 1 -
|
|
3 files changed, 3 deletions(-)
|
|
|
|
diff --git a/src/mpv/audio/filter/af_lavcac3enc.c b/src/mpv/audio/filter/af_lavcac3enc.c
|
|
index 5695bfd..4d2abca 100644
|
|
--- a/src/mpv/audio/filter/af_lavcac3enc.c
|
|
+++ b/src/mpv/audio/filter/af_lavcac3enc.c
|
|
@@ -26,7 +26,6 @@
|
|
#include <assert.h>
|
|
|
|
#include <libavcodec/avcodec.h>
|
|
-#include <libavutil/audioconvert.h>
|
|
#include <libavutil/intreadwrite.h>
|
|
#include <libavutil/common.h>
|
|
#include <libavutil/bswap.h>
|
|
diff --git a/src/mpv/audio/filter/af_lavrresample.c b/src/mpv/audio/filter/af_lavrresample.c
|
|
index 265fa4b..83b5505 100644
|
|
--- a/src/mpv/audio/filter/af_lavrresample.c
|
|
+++ b/src/mpv/audio/filter/af_lavrresample.c
|
|
@@ -28,7 +28,6 @@
|
|
#include <assert.h>
|
|
|
|
#include <libavutil/opt.h>
|
|
-#include <libavutil/audioconvert.h>
|
|
#include <libavutil/common.h>
|
|
#include <libavutil/samplefmt.h>
|
|
#include <libavutil/mathematics.h>
|
|
diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
|
|
index b322982..16ff8c1 100644
|
|
--- a/src/mpv/audio/out/ao_lavc.c
|
|
+++ b/src/mpv/audio/out/ao_lavc.c
|
|
@@ -25,7 +25,6 @@
|
|
#include <limits.h>
|
|
|
|
#include <libavutil/common.h>
|
|
-#include <libavutil/audioconvert.h>
|
|
|
|
#include "config.h"
|
|
#include "options/options.h"
|