Mercurial > mplayer.hg
changeset 17343:b07bb7ee7ce4
include the right avcodec.h, consistently with the rest of mplayer
| author | nicodvb |
|---|---|
| date | Sun, 08 Jan 2006 14:03:42 +0000 |
| parents | adb64d908347 |
| children | 180bd6b3f6c2 |
| files | libmpdemux/demux_asf.c libmpdemux/demux_real.c libmpdemux/demux_viv.c libmpdemux/video.c |
| diffstat | 4 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_asf.c Sun Jan 08 13:35:54 2006 +0000 +++ b/libmpdemux/demux_asf.c Sun Jan 08 14:03:42 2006 +0000 @@ -62,8 +62,10 @@ *src = dst; } -#ifdef USE_LIBAVCODEC -#include "avcodec.h" +#ifdef USE_LIBAVCODEC_SO +#include <ffmpeg/avcodec.h> +#elif defined(USE_LIBAVCODEC) +#include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 #endif
--- a/libmpdemux/demux_real.c Sun Jan 08 13:35:54 2006 +0000 +++ b/libmpdemux/demux_real.c Sun Jan 08 14:03:42 2006 +0000 @@ -32,8 +32,10 @@ #include "stheader.h" #include "bswap.h" -#ifdef USE_LIBAVCODEC -#include "avcodec.h" +#ifdef USE_LIBAVCODEC_SO +#include <ffmpeg/avcodec.h> +#elif defined(USE_LIBAVCODEC) +#include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 #endif
--- a/libmpdemux/demux_viv.c Sun Jan 08 13:35:54 2006 +0000 +++ b/libmpdemux/demux_viv.c Sun Jan 08 14:03:42 2006 +0000 @@ -15,8 +15,10 @@ #include "stheader.h" #include "bswap.h" -#ifdef USE_LIBAVCODEC -#include "avcodec.h" +#ifdef USE_LIBAVCODEC_SO +#include <ffmpeg/avcodec.h> +#elif defined(USE_LIBAVCODEC) +#include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 #endif
--- a/libmpdemux/video.c Sun Jan 08 13:35:54 2006 +0000 +++ b/libmpdemux/video.c Sun Jan 08 14:03:42 2006 +0000 @@ -22,8 +22,10 @@ /* sub_cc (closed captions)*/ #include "sub_cc.h" -#ifdef USE_LIBAVCODEC -#include "avcodec.h" +#ifdef USE_LIBAVCODEC_SO +#include <ffmpeg/avcodec.h> +#elif defined(USE_LIBAVCODEC) +#include "libavcodec/avcodec.h" #else #define FF_INPUT_BUFFER_PADDING_SIZE 8 #endif