Revision 755bfeab libavformat/avformat.h

View differences:

libavformat/avformat.h
158 158
#define AVFMT_RAWPICTURE    0x0020 /**< format wants AVPicture structure for
159 159
                                      raw picture data */
160 160
#define AVFMT_GLOBALHEADER  0x0040 /**< format wants global header */
161
#define AVFMT_NOTIMESTAMPS  0x0080 /**< format doesnt need / has any timestamps */
161
#define AVFMT_NOTIMESTAMPS  0x0080 /**< format does not need / have any timestamps */
162 162
#define AVFMT_GENERIC_INDEX 0x0100 /**< use generic index building code */
163 163

  
164 164
typedef struct AVOutputFormat {
......
295 295
    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
296 296
    /* ffmpeg.c private use */
297 297
    int stream_copy; /**< if set, just copy stream */
298
    enum AVDiscard discard; ///< selects which packets can be discarded at will and dont need to be demuxed
298
    enum AVDiscard discard; ///< selects which packets can be discarded at will and do not need to be demuxed
299 299
    //FIXME move stuff to a flags field?
300 300
    /** quality, as it has been removed from AVCodecContext and put in AVVideoFrame
301
     * MN:dunno if thats the right place, for it */
301
     * MN: dunno if that is the right place for it */
302 302
    float quality;
303 303
    /** decoding: pts of the first frame of the stream, in stream time base. */
304 304
    int64_t start_time;
......
546 546
 *
547 547
 * @param ic media file handle
548 548
 * @return >=0 if OK. AVERROR_xxx if error.
549
 * @todo let user decide somehow what information is needed so we dont waste time geting stuff the user doesnt need
549
 * @todo Let user decide somehow what information is needed so we do not waste time geting stuff the user does not need.
550 550
 */
551 551
int av_find_stream_info(AVFormatContext *ic);
552 552

  
......
666 666

  
667 667
/**
668 668
 * Does a binary search using av_index_search_timestamp() and AVCodec.read_timestamp().
669
 * this isnt supposed to be called directly by a user application, but by demuxers
669
 * This is not supposed to be called directly by a user application, but by demuxers.
670 670
 * @param target_ts target timestamp in the time base of the given stream
671 671
 * @param stream_index stream number
672 672
 */
......
676 676
 * Updates cur_dts of all streams based on given timestamp and AVStream.
677 677
 *
678 678
 * Stream ref_st unchanged, others set cur_dts in their native timebase
679
 * only needed for timestamp wrapping or if (dts not set and pts!=dts)
679
 * only needed for timestamp wrapping or if (dts not set and pts!=dts).
680 680
 * @param timestamp new dts expressed in time_base of param ref_st
681 681
 * @param ref_st reference stream giving time_base of param timestamp
682 682
 */
......
684 684

  
685 685
/**
686 686
 * Does a binary search using read_timestamp().
687
 * this isnt supposed to be called directly by a user application, but by demuxers
687
 * This is not supposed to be called directly by a user application, but by demuxers.
688 688
 * @param target_ts target timestamp in the time base of the given stream
689 689
 * @param stream_index stream number
690 690
 */
......
694 694
int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
695 695

  
696 696
/**
697
 * allocate the stream private data and write the stream header to an
698
 * output media file
697
 * Allocate the stream private data and write the stream header to an
698
 * output media file.
699 699
 *
700 700
 * @param s media file handle
701 701
 * @return 0 if OK. AVERROR_xxx if error.

Also available in: Unified diff