diff options
| -rw-r--r-- | src/libffmpeg/Makefile.am | 5 | ||||
| -rw-r--r-- | src/libffmpeg/ff_audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 43e355575..23924dc5b 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -4,11 +4,6 @@ if HAVE_FFMPEG AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) -# When using external FFmpeg, consider everything present, as it is -# outside xine's scope to handle it -ffmpeg_config.h: - echo "#define EXTERNAL_FFMPEG 1" > ffmpeg_config.h - else ff_cppflags = -I$(top_srcdir)/contrib/ffmpeg/libavutil \ -I$(top_srcdir)/contrib/ffmpeg/libavcodec \ diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index e0d6e5cab..5cd703d15 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -25,7 +25,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" -#include "ffmpeg_config.h" +# ifndef HAVE_FFMPEG +# include "ffmpeg_config.h" +# endif #endif #include <stdlib.h> diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 9ae0d791c..2ada59eb9 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -25,7 +25,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" -#include "ffmpeg_config.h" +# ifndef HAVE_FFMPEG +# include "ffmpeg_config.h" +# endif #endif #include <stdlib.h> |