2 files changed, 2 insertions, 16 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 114fb368d7..0b07ffb941 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -33,17 +33,12 @@
 #ifdef USE_LIBAVFORMAT_SO
 #include <ffmpeg/avformat.h>
 #include <ffmpeg/opt.h>
-typedef struct CodecTag {
-    int id;
-    unsigned int tag;
-    unsigned int invalid_asf : 1;
-} CodecTag;
 #else
 #include "avformat.h"
-#include "riff.h"
 #include "avi.h"
 #include "opt.h"
 #endif
+#include "riff.h"
 
 #define PROBE_BUF_SIZE 2048
 
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 0bf7990d3b..f9531a35a8 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -19,19 +19,10 @@
 #include "m_option.h"
 #ifdef USE_LIBAVFORMAT_SO
 #include <ffmpeg/avformat.h>
-typedef struct CodecTag {
-    int id;
-    unsigned int tag;
-    unsigned int invalid_asf : 1;
-} CodecTag;
-unsigned int codec_get_wav_tag(int id);
-enum CodecID codec_get_bmp_id(unsigned int tag);
-enum CodecID codec_get_wav_id(unsigned int tag);
-enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag);
 #else
 #include "avformat.h"
-#include "libavformat/riff.h"
 #endif
+#include "libavformat/riff.h"
 
 extern const CodecTag mp_wav_tags[];