* configure.ac.in, modules/codec/ffmpeg/ffmpeg.c: fixed my last breakage in the ffmpe...
authorGildas Bazin <gbazin@videolan.org>
Sun, 20 Apr 2003 14:11:25 +0000 (14:11 +0000)
committerGildas Bazin <gbazin@videolan.org>
Sun, 20 Apr 2003 14:11:25 +0000 (14:11 +0000)
configure.ac.in
modules/codec/ffmpeg/ffmpeg.c

index 49315ea..9600dc8 100644 (file)
@@ -1534,7 +1534,7 @@ then
   dnl
   dnl test for !(--with-ffmpeg-tree)
   dnl
   dnl
   dnl test for !(--with-ffmpeg-tree)
   dnl
-  if test "x${with_ffmpeg}" == "xno" -o "x${with_ffmpeg}" == "x"; then
+  if test "x${with_ffmpeg_tree}" == "xno" -o "x${with_ffmpeg_tree}" == "x";then
     CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
     AC_CHECK_LIB(avcodec, avcodec_init, [
     CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
     AC_CHECK_LIB(avcodec, avcodec_init, [
index b7ff89c..23b8a39 100644 (file)
@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.31 2003/04/20 11:57:13 gbazin Exp $
+ * $Id: ffmpeg.c,v 1.32 2003/04/20 14:11:25 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -53,7 +53,7 @@
 #include "ffmpeg.h"
 
 #ifdef LIBAVCODEC_PP
 #include "ffmpeg.h"
 
 #ifdef LIBAVCODEC_PP
-#   ifndef HAVE_POSTPROC_POSTPROCESS_H
+#   ifdef HAVE_POSTPROC_POSTPROCESS_H
 #       include <postproc/postprocess.h>
 #   else
 #       include <libpostproc/postprocess.h>
 #       include <postproc/postprocess.h>
 #   else
 #       include <libpostproc/postprocess.h>