From 53db45b7d3b052c2af7c2a96192308a36fd179d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 1 Jul 2009 20:39:18 +0000 Subject: [PATCH] * Added libavcodec to include dirs of libavformat * Removed inclusion of internal.h from libavcodec.h, it's not there in the plain FFmpeg 0.5 version of the file. The last item fixes the GCC2 build, at least AFAICT. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31364 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h | 2 -- src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h index 6b9b72dd27..b078bc98c2 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h +++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h @@ -3344,6 +3344,4 @@ void av_register_hwaccel(AVHWAccel *hwaccel); */ AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel); -#include "internal.h" - #endif /* AVCODEC_AVCODEC_H */ diff --git a/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile index e58e203697..bde8fde6dd 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavformat ; SubDirHdrs [ FDirName $(SUBDIR) .. ] ; +SubDirHdrs [ FDirName $(SUBDIR) ../libavcodec ] ; SubDirHdrs [ FDirName $(SUBDIR) ../libavutil ] ; UseLibraryHeaders zlib ;