Skip to content

V
vlc
Commit 22d8a047 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Detect new FFmpeg headers location

parent 70361b4f
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 32 deletions
configure.ac
View file @ 22d8a047
...@@ -2680,10 +2680,10 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2680,10 +2680,10 @@ dnl Look for a ffmpeg-config (we are on debian )
AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH}) AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH})
if test "${FFMPEG_CONFIG}" != "no" if test "${FFMPEG_CONFIG}" != "no"
then then
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) AC_CHECK_HEADERS(postproc/postprocess.h libpostproc/postprocess.h.)
VLC_ADD_PLUGINS([ffmpeg]) VLC_ADD_PLUGINS([ffmpeg])
if test "${enable_sout}" != "no"; then if test "${enable_sout}" != "no"; then
VLC_ADD_PLUGINS([stream_out_switcher]) VLC_ADD_PLUGINS([stream_out_switcher])
...@@ -2696,10 +2696,13 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2696,10 +2696,13 @@ dnl Look for a ffmpeg-config (we are on debian )
dnl Trying with pkg-config dnl Trying with pkg-config
PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
[ [
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) VLC_SAVE_FLAGS
AC_CHECK_HEADERS(ffmpeg/avformat.h) CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
AC_CHECK_HEADERS(ffmpeg/avutil.h) CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h libpostproc/postprocess.h)
if test "${SYS}" = "darwin"; then if test "${SYS}" = "darwin"; then
VLC_ADD_BUILTINS([ffmpeg]) VLC_ADD_BUILTINS([ffmpeg])
else else
...@@ -2718,6 +2721,7 @@ dnl Trying with pkg-config ...@@ -2718,6 +2721,7 @@ dnl Trying with pkg-config
PKG_CHECK_MODULES(POSTPROC, libpostproc,[ PKG_CHECK_MODULES(POSTPROC, libpostproc,[
VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}]) VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}])
],[ true ]) ],[ true ])
VLC_RESTORE_FLAGS
],[ ],[
dnl dnl
...@@ -2725,10 +2729,10 @@ dnl Trying with pkg-config ...@@ -2725,10 +2729,10 @@ dnl Trying with pkg-config
dnl dnl
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) AC_CHECK_HEADERS(postproc/postprocess.h libpostproc/postprocess.h)
AC_CHECK_LIB(avutil, av_crc_init, [ AC_CHECK_LIB(avutil, av_crc_init, [
VLC_ADD_LDFLAGS([ffmpeg],[-lavutil]) VLC_ADD_LDFLAGS([ffmpeg],[-lavutil])
......
modules/codec/ffmpeg/audio.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library * audio.c: audio decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2003 the VideoLAN team * Copyright (C) 1999-2003 the VideoLAN team
* $Id$ * $Id: e9bbbf4f02c1ed03a675a01a454e20da950a1d2c $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
...@@ -29,7 +29,9 @@ ...@@ -29,7 +29,9 @@
#include <vlc/decoder.h> #include <vlc/decoder.h>
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/codec/ffmpeg/chroma.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* chroma.c: chroma conversion using ffmpeg library * chroma.c: chroma conversion using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team * Copyright (C) 1999-2001 the VideoLAN team
* $Id$ * $Id: 67176722e9e6427a26e688099e86eed10982bffa $
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
#include <vlc/vout.h> #include <vlc/vout.h>
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/codec/ffmpeg/demux.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* demux.c: demuxer using ffmpeg (libavformat). * demux.c: demuxer using ffmpeg (libavformat).
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 the VideoLAN team * Copyright (C) 2004 the VideoLAN team
* $Id$ * $Id: 95d2460bf93b85608fa27565f1475aadd8a57360 $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
...@@ -32,7 +32,9 @@ ...@@ -32,7 +32,9 @@
#include "vlc_meta.h" #include "vlc_meta.h"
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVFORMAT_H #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
# include <libavformat/avformat.h>
#elif defined(HAVE_FFMPEG_AVFORMAT_H)
# include <ffmpeg/avformat.h> # include <ffmpeg/avformat.h>
#else #else
# include <avformat.h> # include <avformat.h>
......
modules/codec/ffmpeg/encoder.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* encoder.c: video and audio encoder using the ffmpeg library * encoder.c: video and audio encoder using the ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team * Copyright (C) 1999-2004 the VideoLAN team
* $Id$ * $Id: 6c047e3306d4689e4df2d70843fdd85978b3e0b7 $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
/* ffmpeg header */ /* ffmpeg header */
#define HAVE_MMX 1 #define HAVE_MMX 1
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/codec/ffmpeg/ffmpeg.c
View file @ 22d8a047
...@@ -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 the VideoLAN team * Copyright (C) 1999-2001 the VideoLAN team
* $Id$ * $Id: 7bacb2eec7f29bf73a418bf3391171df854b78cb $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
/* ffmpeg header */ /* ffmpeg header */
#define HAVE_MMX 1 #define HAVE_MMX 1
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/codec/ffmpeg/mux.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mux.c: muxer using ffmpeg (libavformat). * mux.c: muxer using ffmpeg (libavformat).
***************************************************************************** *****************************************************************************
* Copyright (C) 2006 the VideoLAN team * Copyright (C) 2006 the VideoLAN team
* $Id$ * $Id: b16eda2ca11b0f133230261a7e3b25da504c7a4f $
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#include <vlc/sout.h> #include <vlc/sout.h>
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVFORMAT_H #ifdef HAVE_LIBAVCODEC_AVFORMAT_H
# include <libavformat/avformat.h>
#elif defined(HAVE_FFMPEG_AVFORMAT_H)
# include <ffmpeg/avformat.h> # include <ffmpeg/avformat.h>
#else #else
# include <avformat.h> # include <avformat.h>
......
modules/codec/ffmpeg/postprocess.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* postprocess.c: video postprocessing using the ffmpeg library * postprocess.c: video postprocessing using the ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team * Copyright (C) 1999-2001 the VideoLAN team
* $Id$ * $Id: 2c9471842b31cdcdd4bfad33cff706829f7d72e9 $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
#include <vlc/decoder.h> #include <vlc/decoder.h>
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/codec/ffmpeg/video.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.c: video decoder using the ffmpeg library * video.c: video decoder using the ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team * Copyright (C) 1999-2001 the VideoLAN team
* $Id$ * $Id: 5376a0d2d02a3ecdf7cb2c4c200d5749e803182b $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
#include <vlc/input.h> /* hmmm, just for INPUT_RATE_DEFAULT */ #include <vlc/input.h> /* hmmm, just for INPUT_RATE_DEFAULT */
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/codec/ffmpeg/video_filter.c
View file @ 22d8a047
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* using the ffmpeg library * using the ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team * Copyright (C) 1999-2001 the VideoLAN team
* $Id$ * $Id: a6d66457c73a31abbe49d51c6f0ef10b6a57234b $
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
#include "vlc_filter.h" #include "vlc_filter.h"
/* ffmpeg header */ /* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.h>
......
modules/stream_out/switcher.c
View file @ 22d8a047
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* switcher.c: MPEG2 video switcher module * switcher.c: MPEG2 video switcher module
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 the VideoLAN team * Copyright (C) 2004 the VideoLAN team
* $Id$ * $Id: 7250426191120abe4df08ece7219654d6a80b428 $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
#include <network.h> #include <network.h>
#define HAVE_MMX #define HAVE_MMX
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined( HAVE_FFMPEG_AVCODEC_H )
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
# include <avcodec.h> # include <avcodec.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