# HG changeset patch
# User reimar
# Date 1168094405 0
# Node ID cd705f30bb31e660a6413fae788b82c20c22dca1
# Parent  3111015f8474423c81d9ec977efdb3e773c9d499
Include libavformat/riff.h when building with static libavformat and
add and correct prototypes if not.

diff -r 3111015f8474 -r cd705f30bb31 libmpcodecs/ae_lavc.c
--- a/libmpcodecs/ae_lavc.c	Sat Jan 06 13:38:30 2007 +0000
+++ b/libmpcodecs/ae_lavc.c	Sat Jan 06 14:40:05 2007 +0000
@@ -29,8 +29,20 @@
 extern int  avcodec_inited;
 static int compressed_frame_size = 0;
 #if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
-extern unsigned int codec_get_wav_tag(int id);
-extern const int mp_wav_tags[];
+#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);
+unsigned int codec_get_tag(const CodecTag *tags, int id);
+#else
+#include "libavformat/avformat.h"
+#include "libavformat/riff.h"
+#endif
+extern const CodecTag mp_wav_tags[];
 #endif
 
 static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a)
diff -r 3111015f8474 -r cd705f30bb31 libmpdemux/muxer_lavf.c
--- a/libmpdemux/muxer_lavf.c	Sat Jan 06 13:38:30 2007 +0000
+++ b/libmpdemux/muxer_lavf.c	Sat Jan 06 14:40:05 2007 +0000
@@ -19,14 +19,21 @@
 #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
 
-extern unsigned int codec_get_wav_tag(int id);
-extern enum CodecID codec_get_bmp_id(unsigned int tag);
-extern enum CodecID codec_get_wav_id(unsigned int tag);
-extern const int mp_wav_tags[];
+extern const CodecTag mp_wav_tags[];
 
 extern char *info_name;
 extern char *info_artist;