summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-05-28 13:53:03 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-05-28 13:53:03 +0000
commitb5829892b3fa0cd98ec81213624f1c530c8eadd8 (patch)
tree7a7c08ab9882bb182e0cd122d16dc0c9da7b4030
parentdd43be108587af6968dbec55b12aebcbd5ada49a (diff)
downloadxine-lib-b5829892b3fa0cd98ec81213624f1c530c8eadd8.tar.gz
xine-lib-b5829892b3fa0cd98ec81213624f1c530c8eadd8.tar.bz2
video_out_dxr3.h includes other stuff from the src/dxr3 directory, so there
should be an include path pointing there CVS patchset: 4975 CVS date: 2003/05/28 13:53:03
-rw-r--r--src/libffmpeg/Makefile.am1
-rw-r--r--src/libffmpeg/xine_encoder.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 0ef516358..565982fc1 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -13,6 +13,7 @@ libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_ff.la
if HAVE_DXR3
+AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3
xineplug_decode_ff_la_SOURCES = xine_decoder.c xine_encoder.c
# The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and
# dlsym()ing the necessary function. Therefore we must allow more exported
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index 4502fb372..c3b9f692e 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_encoder.c,v 1.1 2003/05/25 18:34:54 mroi Exp $
+ * $Id: xine_encoder.c,v 1.2 2003/05/28 13:53:03 mroi Exp $
*/
/* mpeg encoders for the dxr3 video out plugin. */
@@ -29,7 +29,7 @@
#include <errno.h>
#include <math.h>
-#include "../dxr3/video_out_dxr3.h"
+#include "video_out_dxr3.h"
#include "libavcodec/avcodec.h"
#define LOG_ENC 0