Revision da24c5e3 libavformat/avformat.h

View differences:

libavformat/avformat.h
5 5
extern "C" {
6 6
#endif
7 7

  
8
#define LIBAVFORMAT_BUILD       4608
8
#define LIBAVFORMAT_BUILD       4609
9 9

  
10 10
#define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT
11 11
#define LIBAVFORMAT_VERSION     FFMPEG_VERSION
......
42 42
} AVPacket; 
43 43
#define PKT_FLAG_KEY   0x0001
44 44

  
45
/* initialize optional fields of a packet */
45 46
static inline void av_init_packet(AVPacket *pkt)
46 47
{
47 48
    pkt->pts   = AV_NOPTS_VALUE;
......
102 103
    int channel; /* used to select dv channel */
103 104
    const char *device; /* video4linux, audio or DV device */
104 105
    const char *standard; /* tv standard, NTSC, PAL, SECAM */
106
    int mpeg2ts_raw:1;  /* force raw MPEG2 transport stream output, if possible */
107
    int mpeg2ts_compute_pcr:1; /* compute exact PCR for each transport
108
                                  stream packet (only meaningful if
109
                                  mpeg2ts_raw is TRUE */
105 110
} AVFormatParameters;
106 111

  
107 112
#define AVFMT_NOFILE        0x0001 /* no file should be opened */
108 113
#define AVFMT_NEEDNUMBER    0x0002 /* needs '%d' in filename */ 
109
#define AVFMT_NOHEADER      0x0004 /* signal that no header is present
110
                                      (streams are added dynamically) */
111 114
#define AVFMT_SHOW_IDS      0x0008 /* show format stream IDs numbers */
112 115
#define AVFMT_RAWPICTURE    0x0020 /* format wants AVPicture structure for
113 116
                                      raw picture data */
......
150 153
                       AVFormatParameters *ap);
151 154
    /* read one packet and put it in 'pkt'. pts and flags are also
152 155
       set. 'av_new_stream' can be called only if the flag
153
       AVFMT_NOHEADER is used. */
156
       AVFMTCTX_NOHEADER is used. */
154 157
    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
155 158
    /* close the stream. The AVFormatContext and AVStreams are not
156 159
       freed by this function */
......
158 161
    /* seek at or before a given pts (given in microsecond). The pts
159 162
       origin is defined by the stream */
160 163
    int (*read_seek)(struct AVFormatContext *, int64_t pts);
161
    /* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_NOHEADER */
164
    /* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER */
162 165
    int flags;
163 166
    /* if extensions are defined, then no probe is done. You should
164 167
       usually not use extension format guessing because it is not
......
181 184
    int codec_info_state;     
182 185
    int codec_info_nb_repeat_frames;
183 186
    int codec_info_nb_real_frames;
184
    /* PTS generation when outputing stream */
187
    /* encoding: PTS generation when outputing stream */
185 188
    AVFrac pts;
186 189
    /* ffmpeg.c private use */
187 190
    int stream_copy; /* if TRUE, just copy stream */
......
196 199
    int64_t duration;
197 200
} AVStream;
198 201

  
202
#define AVFMTCTX_NOHEADER      0x0001 /* signal that no header is present
203
                                         (streams are added dynamically) */
204

  
199 205
#define MAX_STREAMS 20
200 206

  
201 207
/* format I/O context */
......
218 224
    int track; /* track number, 0 if none */
219 225
    char genre[32]; /* ID3 genre */
220 226

  
221
    int flags; /* format specific flags */
227
    int ctx_flags; /* format specific flags, see AVFMTCTX_xx */
222 228
    /* private data for pts handling (do not modify directly) */
223 229
    int pts_wrap_bits; /* number of bits in pts (used for wrapping control) */
224 230
    int pts_num, pts_den; /* value to convert to seconds */
......
448 454
/* media file input */
449 455
AVInputFormat *av_find_input_format(const char *short_name);
450 456
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
457
int av_open_input_stream(AVFormatContext **ic_ptr, 
458
                         ByteIOContext *pb, const char *filename, 
459
                         AVInputFormat *fmt, AVFormatParameters *ap);
451 460
int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, 
452 461
                       AVInputFormat *fmt,
453 462
                       int buf_size,

Also available in: Unified diff