diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-08-16 15:31:23 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-08-16 15:31:23 +0000 |
| commit | 6bbed3ff2fb8043f407a76bc4112ac0fa1e0d28a (patch) | |
| tree | bd8c5c272d985cdce7d7df62462c81ebc680189a /src/libffmpeg/xine_decoder.h | |
| parent | 1398bff6898de4781bb6f19ca326928ccdc0fa0f (diff) | |
| download | xine-lib-6bbed3ff2fb8043f407a76bc4112ac0fa1e0d28a.tar.gz xine-lib-6bbed3ff2fb8043f407a76bc4112ac0fa1e0d28a.tar.bz2 | |
header inclusion has to depend on the configure detection, because when
always using <avcodec.h>, someone who has external ffmpeg installed, but
wants to use xine's internal one will include the wrong headers
CVS patchset: 6888
CVS date: 2004/08/16 15:31:23
Diffstat (limited to 'src/libffmpeg/xine_decoder.h')
| -rw-r--r-- | src/libffmpeg/xine_decoder.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/xine_decoder.h index 91d32bff7..3119a41db 100644 --- a/src/libffmpeg/xine_decoder.h +++ b/src/libffmpeg/xine_decoder.h @@ -17,13 +17,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.h,v 1.2 2004/07/31 18:57:45 valtri Exp $ + * $Id: xine_decoder.h,v 1.3 2004/08/16 15:31:23 mroi Exp $ * */ #ifndef HAVE_XINE_DECODER_H #define HAVE_XINE_DECODER_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef _MSC_VER /* ffmpeg has own definitions of those types */ # undef int8_t @@ -36,7 +40,11 @@ # undef uint64_t #endif -#include <avcodec.h> +#ifdef HAVE_FFMPEG +# include <avcodec.h> +#else +# include "libavcodec/avcodec.h" +#endif #ifdef _MSC_VER # undef malloc |