summaryrefslogtreecommitdiff
path: root/src/libffmpeg/ff_dvaudio_decoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg/ff_dvaudio_decoder.c')
-rw-r--r--src/libffmpeg/ff_dvaudio_decoder.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c
index 0796b3862..08ddf4e30 100644
--- a/src/libffmpeg/ff_dvaudio_decoder.c
+++ b/src/libffmpeg/ff_dvaudio_decoder.c
@@ -52,13 +52,8 @@
# undef uint64_t
#endif
-#ifdef HAVE_FFMPEG
-# include <avcodec.h>
-# include "libavcodec/dvdata.h"
-#else
-# include "libavcodec/avcodec.h"
-# include "libavcodec/dvdata.h"
-#endif
+#include <avcodec.h>
+#include <dvdata.h> /* This is not installed by FFmpeg, its usage has to be cleared up */
#ifdef _MSC_VER
# undef malloc
@@ -93,7 +88,6 @@ typedef struct dvaudio_decoder_s {
} dvaudio_decoder_t;
-
/*
* This is the dumbest implementation of all -- it simply looks at
* a fixed offset and if pack isn't there -- fails. We might want