Commit c52797f6 authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac.in, modules/codec/ffmpeg/ffmpeg.c: fixed my last breakage in the ffmpeg detection code.
parent b193e8e2
...@@ -1534,7 +1534,7 @@ then ...@@ -1534,7 +1534,7 @@ then
dnl dnl
dnl test for !(--with-ffmpeg-tree) dnl test for !(--with-ffmpeg-tree)
dnl 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}" CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_LIB(avcodec, avcodec_init, [ AC_CHECK_LIB(avcodec, avcodec_init, [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library * ffmpeg.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * 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 @@ ...@@ -53,7 +53,7 @@
#include "ffmpeg.h" #include "ffmpeg.h"
#ifdef LIBAVCODEC_PP #ifdef LIBAVCODEC_PP
# ifndef HAVE_POSTPROC_POSTPROCESS_H # ifdef HAVE_POSTPROC_POSTPROCESS_H
# include <postproc/postprocess.h> # include <postproc/postprocess.h>
# else # else
# include <libpostproc/postprocess.h> # include <libpostproc/postprocess.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment