From c52797f60fb9794ced96c8b44482add00819be5c Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sun, 20 Apr 2003 14:11:25 +0000 Subject: [PATCH] * configure.ac.in, modules/codec/ffmpeg/ffmpeg.c: fixed my last breakage in the ffmpeg detection code. --- configure.ac.in | 2 +- modules/codec/ffmpeg/ffmpeg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 49315ea017..9600dc8ad7 100644 --- 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 b7ff89cba4..23b8a39bd8 100644 --- 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 * @@ -53,7 +53,7 @@ #include "ffmpeg.h" #ifdef LIBAVCODEC_PP -# ifndef HAVE_POSTPROC_POSTPROCESS_H +# ifdef HAVE_POSTPROC_POSTPROCESS_H # include # else # include -- 2.39.5