summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-06 17:28:11 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-06 17:28:11 +0000
commit0c8d9ba25fcc154143688b3c6a865e5731d88602 (patch)
tree781dfc010d0ecde25aec55fec6772dc87e1d53bf /libmpcodecs
parent3508f4da088e88cace46c71561a0ecde86bbb7a8 (diff)
downloadmpv-0c8d9ba25fcc154143688b3c6a865e5731d88602.tar.bz2
mpv-0c8d9ba25fcc154143688b3c6a865e5731d88602.tar.xz
Include "internal" libavformat/riff.h also when dynamic libavformat is used
instead of duplicating typedefs and function prototypes in already three different places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ae_lavc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index ba21bf220d..9e53fa8521 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -31,17 +31,10 @@ static int compressed_frame_size = 0;
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
#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
+#include "libavformat/riff.h"
extern const CodecTag mp_wav_tags[];
#endif