You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

90 lines
2.5 KiB

https://bugs.gentoo.org/show_bug.cgi?id=297872
http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca
From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001
From: Jeremy Olexa <darkside@gentoo.org>
Date: Tue, 22 Dec 2009 00:22:42 -0600
Subject: [PATCH] Update reference to ffmpeg header files
---
configure | 4 ++--
src/av_mpeg4_part10.c | 2 +-
src/av_mpeg4_part2.c | 2 +-
src/containers.c | 2 +-
src/profiles.h | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 8acbd9d..85c1091 100755
--- a/configure
+++ b/configure
@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
fi
echolog "Checking for libavformat ..."
-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
echolog "Checking for libavcodec ..."
-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
#################################################
# version
diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c
index bd17022..f9c8ee5 100644
--- a/src/av_mpeg4_part10.c
+++ b/src/av_mpeg4_part10.c
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c
index 0148384..823e1b6 100644
--- a/src/av_mpeg4_part2.c
+++ b/src/av_mpeg4_part2.c
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff --git a/src/containers.c b/src/containers.c
index 71b51f7..ca0819b 100644
--- a/src/containers.c
+++ b/src/containers.c
@@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
#include "containers.h"
#include "profiles.h"
diff --git a/src/profiles.h b/src/profiles.h
index 7b86d33..a7fc0fd 100644
--- a/src/profiles.h
+++ b/src/profiles.h
@@ -22,8 +22,8 @@
#ifndef _PROFILES_H_
#define _PROFILES_H_
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#include "dlna_internals.h"
#include "containers.h"
--
1.6.4.4