diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-25 15:46:36 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-25 15:46:36 +0000 |
commit | 21c200e767312f3fe2d335a3e4cb2597cfdd0cfb (patch) | |
tree | 1f33c99f5ede0b741d5264726b6f8a1ab4488119 /libmpdemux | |
parent | 9c30916c7a74ad1d3e05ff18648948d138633962 (diff) | |
download | mpv-21c200e767312f3fe2d335a3e4cb2597cfdd0cfb.tar.bz2 mpv-21c200e767312f3fe2d335a3e4cb2597cfdd0cfb.tar.xz |
FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_asf.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_lavf.c | 16 | ||||
-rw-r--r-- | libmpdemux/demux_mkv.c | 5 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_rtp_internal.h | 4 | ||||
-rw-r--r-- | libmpdemux/demux_viv.c | 4 | ||||
-rw-r--r-- | libmpdemux/muxer_lavf.c | 6 | ||||
-rw-r--r-- | libmpdemux/video.c | 4 |
8 files changed, 11 insertions, 36 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 60697db84f..b23e0f2c4e 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -79,9 +79,7 @@ static void init_priv (struct asf_priv* asf){ asf->vid_ext_frame_index=-1; } -#ifdef USE_LIBAVCODEC_SO -#include <ffmpeg/avcodec.h> -#elif defined(USE_LIBAVCODEC) +#ifdef USE_LIBAVCODEC #include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index cb447fde58..bd3e0cb8cd 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -31,17 +31,11 @@ #include "m_option.h" #include "libvo/sub.h" -#ifdef USE_LIBAVFORMAT_SO -#include <ffmpeg/avformat.h> -#include <ffmpeg/avutil.h> -#include <ffmpeg/opt.h> -#else -#include "avformat.h" -#include "avutil.h" -#include "avi.h" -#include "opt.h" -#endif -#include "riff.h" +#include "libavformat/avformat.h" +#include "libavutil/avutil.h" +#include "libavformat/avi.h" +#include "libavcodec/opt.h" +#include "libavformat/riff.h" #define PROBE_BUF_SIZE 2048 diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 33337548b9..70c8b89f4d 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -39,13 +39,8 @@ #include <zlib.h> #endif -#ifdef USE_LIBAVUTIL_SO -#include <ffmpeg/lzo.h> -#include <ffmpeg/intreadwrite.h> -#else #include "libavutil/lzo.h" #include "libavutil/intreadwrite.h" -#endif #include "libavutil/avstring.h" static unsigned char sipr_swaps[38][2]={ diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 0d4a114266..7554363b25 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -33,9 +33,7 @@ Video codecs: (supported by RealPlayer8 for Linux) #include "demuxer.h" #include "stheader.h" -#ifdef USE_LIBAVCODEC_SO -#include <ffmpeg/avcodec.h> -#elif defined(USE_LIBAVCODEC) +#ifdef USE_LIBAVCODEC #include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index d3dde77fd2..89f6002f98 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.h @@ -10,9 +10,7 @@ extern "C" { #ifndef DEMUXER_H #include "demuxer.h" #endif -#ifdef USE_LIBAVCODEC_SO -#include <ffmpeg/avcodec.h> -#elif defined(USE_LIBAVCODEC) +#ifdef USE_LIBAVCODEC #include "libavcodec/avcodec.h" #endif } diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 7c14a989bf..46ff28841d 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -14,9 +14,7 @@ #include "demuxer.h" #include "stheader.h" -#ifdef USE_LIBAVCODEC_SO -#include <ffmpeg/avcodec.h> -#elif defined(USE_LIBAVCODEC) +#ifdef USE_LIBAVCODEC #include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 8a8851573e..8019044ec9 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -17,11 +17,7 @@ #include "demuxer.h" #include "stheader.h" #include "m_option.h" -#ifdef USE_LIBAVFORMAT_SO -#include <ffmpeg/avformat.h> -#else -#include "avformat.h" -#endif +#include "libavformat/avformat.h" #include "libavutil/avstring.h" enum PixelFormat imgfmt2pixfmt(int fmt); diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 311b72d9ed..fe69c7bf84 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -22,9 +22,7 @@ /* sub_cc (closed captions)*/ #include "sub_cc.h" -#ifdef USE_LIBAVCODEC_SO -#include <ffmpeg/avcodec.h> -#elif defined(USE_LIBAVCODEC) +#ifdef USE_LIBAVCODEC #include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 |