Revision 8bfb108b

View differences:

ffserver.c
234 234
    int conns_served;
235 235
    int64_t bytes_served;
236 236
    int64_t feed_max_size;      /* maximum storage size, zero means unlimited */
237
    int64_t feed_write_index;   /* current write position in feed (it wraps round) */
237
    int64_t feed_write_index;   /* current write position in feed (it wraps around) */
238 238
    int64_t feed_size;          /* current size of feed */
239 239
    struct FFStream *next_feed;
240 240
} FFStream;
241 241

  
242 242
typedef struct FeedData {
243 243
    long long data_count;
244
    float avg_frame_size;   /* frame size averraged over last frames with exponential mean */
244
    float avg_frame_size;   /* frame size averaged over last frames with exponential mean */
245 245
} FeedData;
246 246

  
247 247
static struct sockaddr_in my_http_addr;
libavcodec/avcodec.h
747 747
 * Audio Video Frame.
748 748
 * New fields can be added to the end of FF_COMMON_FRAME with minor version
749 749
 * bumps.
750
 * Removal, reordering and changes to existing fields require a Major
750
 * Removal, reordering and changes to existing fields require a major
751 751
 * version bump. No fields should be added into AVFrame before or after
752 752
 * FF_COMMON_FRAME!
753
 * sizeof(AVFrame) must not be used outside libav*
753
 * sizeof(AVFrame) must not be used outside libav*.
754 754
 */
755 755
typedef struct AVFrame {
756 756
    FF_COMMON_FRAME
......
761 761
/**
762 762
 * main external API structure.
763 763
 * New fields can be added to the end with minor version bumps.
764
 * Removal, reordering and changes to existing fields require a Major
764
 * Removal, reordering and changes to existing fields require a major
765 765
 * version bump.
766
 * sizeof(AVCodecContext) must not be used outside libav*
766
 * sizeof(AVCodecContext) must not be used outside libav*.
767 767
 */
768 768
typedef struct AVCodecContext {
769 769
    /**
libavcodec/imgresample.c
391 391
            h_resample(new_line, owidth,
392 392
                       src_line, iwidth, - FCENTER * POS_FRAC, s->h_incr,
393 393
                       &s->h_filters[0][0]);
394
            /* handle ring buffer wraping */
394
            /* handle ring buffer wrapping */
395 395
            if (ring_y >= LINE_BUF_HEIGHT) {
396 396
                memcpy(s->line_buf + (ring_y - LINE_BUF_HEIGHT) * owidth,
397 397
                       new_line, owidth);
libavformat/avformat.h
272 272
/**
273 273
 * Stream structure.
274 274
 * New fields can be added to the end with minor version bumps.
275
 * Removal, reordering and changes to existing fields require a Major
275
 * Removal, reordering and changes to existing fields require a major
276 276
 * version bump.
277
 * sizeof(AVStream) must not be used outside libav*
277
 * sizeof(AVStream) must not be used outside libav*.
278 278
 */
279 279
typedef struct AVStream {
280 280
    int index;    /**< stream index in AVFormatContext */
281 281
    int id;       /**< format specific stream id */
282 282
    AVCodecContext *codec; /**< codec context */
283 283
    /**
284
     * real base frame rate of the stream.
285
     * this is the lowest framerate with which all timestamps can be
284
     * Real base frame rate of the stream.
285
     * This is the lowest frame rate with which all timestamps can be
286 286
     * represented accurately (it is the least common multiple of all
287
     * framerates in the stream), Note, this value is just a guess!
288
     * for example if the timebase is 1/90000 and all frames have either
289
     * approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1
287
     * frame rates in the stream), Note, this value is just a guess!
288
     * For example if the timebase is 1/90000 and all frames have either
289
     * approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1.
290 290
     */
291 291
    AVRational r_frame_rate;
292 292
    void *priv_data;
......
297 297
    struct AVFrac pts;
298 298

  
299 299
    /**
300
     * this is the fundamental unit of time (in seconds) in terms
301
     * of which frame timestamps are represented. for fixed-fps content,
302
     * timebase should be 1/framerate and timestamp increments should be
300
     * This is the fundamental unit of time (in seconds) in terms
301
     * of which frame timestamps are represented. For fixed-fps content,
302
     * timebase should be 1/frame rate and timestamp increments should be
303 303
     * identically 1.
304 304
     */
305 305
    AVRational time_base;
......
312 312
     * MN: dunno if that is the right place for it */
313 313
    float quality;
314 314
    /**
315
     * decoding: pts of the first frame of the stream, in stream time base.
316
     * only set this if you are absolutely 100% sure that the value you set
317
     * it to really is the pts of the first frame
315
     * Decoding: pts of the first frame of the stream, in stream time base.
316
     * Only set this if you are absolutely 100% sure that the value you set
317
     * it to really is the pts of the first frame.
318 318
     * This may be undefined (AV_NOPTS_VALUE).
319
     * @note the ASF header does NOT contain a correct start_time the ASF
320
     * demuxer must NOT set this
319
     * @note The ASF header does NOT contain a correct start_time the ASF
320
     * demuxer must NOT set this.
321 321
     */
322 322
    int64_t start_time;
323 323
    /**
324
     * decoding: duration of the stream, in stream time base.
324
     * Decoding: duration of the stream, in stream time base.
325 325
     * If a source file does not specify a duration, but does specify
326 326
     * a bitrate, this value will be estimates from bit rate and file size.
327 327
     */
......
351 351
#define AV_PROGRAM_RUNNING 1
352 352

  
353 353
/**
354
 *
355 354
 * New fields can be added to the end with minor version bumps.
356
 * Removal, reordering and changes to existing fields require a Major
355
 * Removal, reordering and changes to existing fields require a major
357 356
 * version bump.
358
 * sizeof(AVProgram) must not be used outside libav*
357
 * sizeof(AVProgram) must not be used outside libav*.
359 358
 */
360 359
typedef struct AVProgram {
361 360
    int            id;
......
375 374
/**
376 375
 * format I/O context.
377 376
 * New fields can be added to the end with minor version bumps.
378
 * Removal, reordering and changes to existing fields require a Major
377
 * Removal, reordering and changes to existing fields require a major
379 378
 * version bump.
380
 * sizeof(AVFormatContext) must not be used outside libav*
379
 * sizeof(AVFormatContext) must not be used outside libav*.
381 380
 */
382 381
typedef struct AVFormatContext {
383 382
    const AVClass *av_class; /**< set by av_alloc_format_context */
libavformat/avio.h
32 32
/**
33 33
 * URL Context.
34 34
 * New fields can be added to the end with minor version bumps.
35
 * Removal, reordering and changes to existing fields require a Major
35
 * Removal, reordering and changes to existing fields require a major
36 36
 * version bump.
37
 * sizeof(URLContext) must not be used outside libav*
37
 * sizeof(URLContext) must not be used outside libav*.
38 38
 */
39 39
struct URLContext {
40 40
    struct URLProtocol *prot;
......
69 69

  
70 70
/**
71 71
 * Return the maximum packet size associated to packetized file
72
 * handle. If the file is not packetized (stream like http or file on
72
 * handle. If the file is not packetized (stream like HTTP or file on
73 73
 * disk), then 0 is returned.
74 74
 *
75 75
 * @param h file handle
......
79 79
void url_get_filename(URLContext *h, char *buf, int buf_size);
80 80

  
81 81
/**
82
 * the callback is called in blocking functions to test regulary if
82
 * The callback is called in blocking functions to test regulary if
83 83
 * asynchronous interruption is needed. AVERROR(EINTR) is returned
84 84
 * in this case by the interrupted function. 'NULL' means no interrupt
85
 * callback is given. i
85
 * callback is given.
86 86
 */
87 87
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
88 88

  
......
95 95
 * @param pause 1 for pause, 0 for resume
96 96
 */
97 97
int av_url_read_pause(URLContext *h, int pause);
98

  
98 99
/**
99 100
 * Seek to a given timestamp relative to some component stream.
100
 * Only meaningful if using a network streaming protocol (e.g. MMS.)
101
 * Only meaningful if using a network streaming protocol (e.g. MMS.).
101 102
 * @param stream_index The stream index that the timestamp is relative to.
102 103
 *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
103 104
 *        units from the beginning of the presentation.
......
145 146
/**
146 147
 * Bytestream IO Context.
147 148
 * New fields can be added to the end with minor version bumps.
148
 * Removal, reordering and changes to existing fields require a Major
149
 * Removal, reordering and changes to existing fields require a major
149 150
 * version bump.
150
 * sizeof(ByteIOContext) must not be used outside libav*
151
 * sizeof(ByteIOContext) must not be used outside libav*.
151 152
 */
152 153
typedef struct {
153 154
    unsigned char *buffer;

Also available in: Unified diff