From a52c97540c588d8fa2aa14e94f936bbdcdef8ec4 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 6 Jan 2007 14:40:05 +0000 Subject: Include libavformat/riff.h when building with static libavformat and add and correct prototypes if not. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/muxer_lavf.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 97c3558a37..0bf7990d3b 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -19,14 +19,21 @@ #include "m_option.h" #ifdef USE_LIBAVFORMAT_SO #include +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; -- cgit v1.2.3