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 /libmpcodecs | |
| 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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ae_lavc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index fd565b4edb..ba21bf220d 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -29,8 +29,20 @@ extern int lavc_param_audio_global_header; 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) |