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/demux_lavf.c | |
| 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/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 16 |
1 files changed, 5 insertions, 11 deletions
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 |