Changeset 0adb6a63ec58c8d0343906fe60dd0320582e553e

Timestamp:

04/20/03 13:57:13 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1050839833 +0000

git-parent:

[50000c8a82333af7c047a92bc34b7f46d35ad57b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1050839833 +0000

Message:

* configure.ac.in, modules/codec/ffmpeg/*, modules/encoder/ffmpeg/*, modules/stream_out/transcode.c: fixed detection of the ffmpeg headers/libs when they are installed in their default location.

Files:

• configure.ac.in (modified) (3 diffs)
• modules/codec/ffmpeg/audio.c (modified) (2 diffs)
• modules/codec/ffmpeg/ffmpeg.c (modified) (3 diffs)
• modules/codec/ffmpeg/video.c (modified) (2 diffs)
• modules/encoder/ffmpeg/audio.c (modified) (2 diffs)
• modules/encoder/ffmpeg/video.c (modified) (2 diffs)
• modules/stream_out/transcode.c (modified) (2 diffs)

configure.ac.in

@@ -1508 +1508 @@
-then
-  AC_ARG_WITH(ffmpeg,
-
-
-
+
+
+
+
+
+
+
+
-    CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${with_ffmpeg}/include/ffmpeg"
-    LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${with_ffmpeg}/lib"
@@ -1516 +1521 @@
-    CPPFLAGS_stream_out_transcode="${CPPFLAGS_stream_out_transcode} -I${with_ffmpeg}/include/ffmpeg"
-    LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -L${with_ffmpeg}/lib"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
-    LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
-    AC_CHECK_LIB(avcodec, avcodec_init, [
-      BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
- 
+
-      dnl  XXX: we don't link with -lavcodec a 2nd time because the OS X
-      dnl       linker would miserably barf on multiple definitions.
@@ -1571 +1547 @@
-    LDFLAGS="${LDFLAGS_save}"
-    CPPFLAGS="${CPPFLAGS_save}"
+  fi
+
+  dnl
+  dnl test for --with-ffmpeg-tree
+  dnl
+  if test "x${with_ffmpeg_tree}" != "xno" -a "x${with_ffmpeg_tree}" != "x";then
+    AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree})
+    real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
+    if test "x${real_ffmpeg_tree}" = x; then
+      dnl  The given directory can't be found
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}])
+    fi
+    if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
+      dnl  Use a custom libffmpeg
+      AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
+      BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
+      LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
+      CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
+
+      dnl  XXX: we don't link with -lavcodec a 2nd time because the OS X
+      dnl       linker would miserably barf on multiple definitions.
+      LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -L${real_ffmpeg_tree}/libavcodec"
+      CPPFLAGS_stream_out_transcode="${CPPFLAGS_stream_out_transcode} -I${real_ffmpeg_tree}/libavcodec"
+    else
+      dnl  The given libavcodec wasn't built
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}])
+    fi
+  fi
+
+  dnl Add postprocessing modules
+  PLUGINS="${PLUGINS} postprocessing_c"
+  if test "x${ac_cv_mmx_inline}" != "xno"; then
+    PLUGINS="${PLUGINS} postprocessing_mmx"
+  fi
+
+  if test "x${ac_cv_mmxext_inline}" != "xno"; then
+    PLUGINS="${PLUGINS} postprocessing_mmxext"
-  fi
-fi

modules/codec/ffmpeg/audio.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-5 2003/04/17 10:58:30 fenrir
+6 2003/04/20 11:57:13 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -46 +46 @@
-#include "aout_internal.h"
-
-
+
+
+
+
+
+
-
-//#include "postprocessing/postprocessing.h"

modules/codec/ffmpeg/ffmpeg.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-0 2003/04/17 10:58:30 fenrir
+1 2003/04/20 11:57:13 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -39 +39 @@
-#endif
-
-
+
+
+
+
+
+
-
-#if LIBAVCODEC_BUILD < 4655
@@ -49 +54 @@
-
-#ifdef LIBAVCODEC_PP
-
+
+
+
+
+
-#else
-#   include "postprocessing/postprocessing.h"

modules/codec/ffmpeg/video.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-0 2003/04/17 10:58:30 fenrir
+1 2003/04/20 11:57:13 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -40 +40 @@
-#endif
-
-
+
+
+
+
+
+
+
-#include "ffmpeg.h"
-
-#ifdef LIBAVCODEC_PP
-
+
+
+
+
+
-#else
-#   include "postprocessing/postprocessing.h"

modules/encoder/ffmpeg/audio.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/01/22 10:41:57 fenrir
+2 2003/04/20 11:57:13 gbazin
- *
- * Authors: Laurent Aimar
@@ -34 +34 @@
-#include "codecs.h"
-
-
+
+
+
+
+
+
-
-/*****************************************************************************

modules/encoder/ffmpeg/video.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/01/22 10:41:57 fenrir
+2 2003/04/20 11:57:13 gbazin
- *
- * Authors: Laurent Aimar
@@ -35 +35 @@
-#include "encoder.h"
-
-
+
+
+
+
+
+
-
-int  E_( OpenEncoderVideo ) ( vlc_object_t * );

modules/stream_out/transcode.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-3 2003/04/16 16:33:35 fenrir
+4 2003/04/20 11:57:13 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -32 +32 @@
-#include <vlc/sout.h>
-
-
+
+
+
+
+
+
-
-/*****************************************************************************