mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
6cfe33d49f
commit
a52c97540c
|
@ -29,8 +29,20 @@ extern int lavc_param_audio_global_header;
|
||||||
extern int avcodec_inited;
|
extern int avcodec_inited;
|
||||||
static int compressed_frame_size = 0;
|
static int compressed_frame_size = 0;
|
||||||
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
|
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
|
||||||
extern unsigned int codec_get_wav_tag(int id);
|
#ifdef USE_LIBAVFORMAT_SO
|
||||||
extern const int mp_wav_tags[];
|
#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
|
#endif
|
||||||
|
|
||||||
static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a)
|
static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a)
|
||||||
|
|
|
@ -19,14 +19,21 @@
|
||||||
#include "m_option.h"
|
#include "m_option.h"
|
||||||
#ifdef USE_LIBAVFORMAT_SO
|
#ifdef USE_LIBAVFORMAT_SO
|
||||||
#include <ffmpeg/avformat.h>
|
#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
|
#else
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
|
#include "libavformat/riff.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern unsigned int codec_get_wav_tag(int id);
|
extern const CodecTag mp_wav_tags[];
|
||||||
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 char *info_name;
|
extern char *info_name;
|
||||||
extern char *info_artist;
|
extern char *info_artist;
|
||||||
|
|
Loading…
Reference in New Issue