diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-06 14:40:05 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-06 14:40:05 +0000 |
| commit | a52c97540c588d8fa2aa14e94f936bbdcdef8ec4 (patch) | |
| tree | 9356a382630e64c27c43497a417e32e9353869a8 /libmpdemux | |
| parent | 6cfe33d49fb26356ef45f4b568db59277d9e2303 (diff) | |
| download | mpv-a52c97540c588d8fa2aa14e94f936bbdcdef8ec4.tar.bz2 mpv-a52c97540c588d8fa2aa14e94f936bbdcdef8ec4.tar.xz | |
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
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 15 |
1 files changed, 11 insertions, 4 deletions
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 <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; |