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 /libmpcodecs/ae_lavc.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 'libmpcodecs/ae_lavc.c')
| -rw-r--r-- | libmpcodecs/ae_lavc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index a13fb7ec52..68c03f4445 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -15,11 +15,7 @@ #include "config.h" #include "libaf/af_format.h" #include "libaf/reorder_ch.h" -#ifdef USE_LIBAVCODEC_SO -#include <ffmpeg/avcodec.h> -#else #include "libavcodec/avcodec.h" -#endif static AVCodec *lavc_acodec; static AVCodecContext *lavc_actx; @@ -30,11 +26,7 @@ extern int lavc_param_audio_global_header; extern int avcodec_initialized; static int compressed_frame_size = 0; #ifdef USE_LIBAVFORMAT -#ifdef USE_LIBAVFORMAT_SO -#include <ffmpeg/avformat.h> -#else #include "libavformat/avformat.h" -#endif extern const struct AVCodecTag *mp_wav_taglists[]; #endif |