Revision 7caf0cc6 libavformat/avformat.h

View differences:

libavformat/avformat.h
25 25
extern "C" {
26 26
#endif
27 27

  
28
#define LIBAVFORMAT_VERSION_INT ((51<<16)+(7<<8)+0)
29
#define LIBAVFORMAT_VERSION     51.7.0
28
#define LIBAVFORMAT_VERSION_INT ((51<<16)+(8<<8)+0)
29
#define LIBAVFORMAT_VERSION     51.8.0
30 30
#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
31 31

  
32 32
#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
......
96 96
/*************************************************/
97 97
/* input/output formats */
98 98

  
99
struct AVCodecTag;
100

  
99 101
struct AVFormatContext;
100 102

  
101 103
/* this structure contains the data a format has to probe a file */
......
155 157
    /* currently only used to set pixel format if not YUV420P */
156 158
    int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
157 159
    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out, AVPacket *in, int flush);
160

  
161
    /**
162
     * list of supported codec_id-codec_tag pairs, ordered by "better choice first"
163
     * the arrays are all CODEC_ID_NONE terminated
164
     */
165
    const struct AVCodecTag *codec_tag[4];
166

  
158 167
    /* private fields */
159 168
    struct AVOutputFormat *next;
160 169
} AVOutputFormat;
......
210 219
       (RTSP) */
211 220
    int (*read_pause)(struct AVFormatContext *);
212 221

  
222
    const struct AVCodecTag *codec_tag[4];
223

  
213 224
    /* private fields */
214 225
    struct AVInputFormat *next;
215 226
} AVInputFormat;
......
396 407

  
397 408
void av_register_all(void);
398 409

  
410
/* codec tag <-> codec id */
411
enum CodecID av_codec_get_id(const struct AVCodecTag *tags[4], unsigned int tag);
412
unsigned int av_codec_get_tag(const struct AVCodecTag *tags[4], enum CodecID id);
413

  
399 414
/* media file input */
400 415
AVInputFormat *av_find_input_format(const char *short_name);
401 416
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);

Also available in: Unified diff