* configure.ac.in, modules/codec/ffmpeg/ffmpeg.c: fixed my last breakage in the ffmpe...

diff --git a/configure.ac.in b/configure.ac.in
index 49315ea0173168789f42370c9c13205d3cd3d8cd..9600dc8ad71b96b0f68bb79a1e719e92d109ffc2 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1534,7 +1534,7 @@ then
   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, [

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index b7ff89cba4e00ed75cbb9a17f35eaf60852bbb93..23b8a39bd8612499b60aad46bedd194c9c587856 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -2,7 +2,7 @@
  * 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>
  *
@@ -53,7 +53,7 @@
 #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>