Libavformat muxes and demuxes.
---
Comments in form of patches please.
libavformat/avformat.h | 53 +++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 149b66f..8eda107 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -620,17 +620,17 @@ typedef struct AVStream {
int index; /**< stream index in AVFormatContext */
/**
* Format-specific stream ID.
- * decoding: set by libavformat
- * encoding: set by the user, replaced by libavformat if left unset
+ * demuxing: set by libavformat
+ * muxing : set by the user, replaced by libavformat if left unset
*/
int id;
/**
* Codec context associated with this stream. Allocated and freed by
* libavformat.
*
- * - decoding: The demuxer exports codec information stored in the headers
+ * - demuxing: The demuxer exports codec information stored in the headers
* here.
- * - encoding: The user sets codec information, the muxer writes it to the
+ * - muxing : The user sets codec information, the muxer writes it to the
* output. Mandatory fields as specified in AVCodecContext
* documentation must be set even if this AVCodecContext is
* not actually used for encoding.
@@ -650,7 +650,7 @@ typedef struct AVStream {
void *priv_data;
/**
- * encoding: pts generation when outputting stream
+ * muxing : pts generation when outputting stream
*/
struct AVFrac pts;
@@ -658,8 +658,8 @@ typedef struct AVStream {
* This is the fundamental unit of time (in seconds) in terms
* of which frame timestamps are represented.
*
- * decoding: set by libavformat
- * encoding: set by libavformat in avformat_write_header. The muxer may
use the
+ * demuxing: set by libavformat
+ * muxing : set by libavformat in avformat_write_header. The muxer may
use the
* user-provided value of @ref AVCodecContext.time_base "codec->time_base"
* as a hint.
*/
@@ -688,8 +688,8 @@ typedef struct AVStream {
/**
* sample aspect ratio (0 if unknown)
- * - encoding: Set by user.
- * - decoding: Set by libavformat.
+ * - muxing : Set by user.
+ * - demuxing: Set by libavformat.
*/
AVRational sample_aspect_ratio;
@@ -704,8 +704,8 @@ typedef struct AVStream {
* For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
* will contain the attached picture.
*
- * decoding: set by libavformat, must not be modified by the caller.
- * encoding: unused
+ * demuxing: set by libavformat, must not be modified by the caller.
+ * muxing : unused
*/
AVPacket attached_pic;
@@ -831,8 +831,8 @@ typedef struct AVFormatContext {
/**
* Can only be iformat or oformat, not both at the same time.
*
- * decoding: set by avformat_open_input().
- * encoding: set by the user.
+ * demuxing: set by avformat_open_input().
+ * muxing : set by the user.
*/
struct AVInputFormat *iformat;
struct AVOutputFormat *oformat;
@@ -846,9 +846,9 @@ typedef struct AVFormatContext {
/**
* I/O context.
*
- * decoding: either set by the user before avformat_open_input() (then
+ * demuxing: either set by the user before avformat_open_input() (then
* the user must close it manually) or set by avformat_open_input().
- * encoding: set by the user.
+ * muxing : set by the user.
*
* Do NOT set this field if AVFMT_NOFILE flag is set in
* iformat/oformat.flags. In such a case, the (de)muxer will handle
@@ -863,10 +863,10 @@ typedef struct AVFormatContext {
* A list of all streams in the file. New streams are created with
* avformat_new_stream().
*
- * decoding: streams are created by libavformat in avformat_open_input().
+ * demuxing: streams are created by libavformat in avformat_open_input().
* If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
* appear in av_read_frame().
- * encoding: streams are created by the user before
avformat_write_header().
+ * muxing : streams are created by the user before
avformat_write_header().
*/
unsigned int nb_streams;
AVStream **streams;
@@ -910,12 +910,13 @@ typedef struct AVFormatContext {
#define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted
/**
- * decoding: size of data to probe; encoding: unused.
+ * demuxing: size of data to probe;
+ * muxing : unused.
*/
unsigned int probesize;
/**
- * decoding: maximum time (in AV_TIME_BASE units) during which the input
should
+ * demuxing: maximum time (in AV_TIME_BASE units) during which the input
should
* be analyzed in avformat_find_stream_info().
*/
int max_analyze_duration;
@@ -971,29 +972,29 @@ typedef struct AVFormatContext {
* Start time of the stream in real world time, in microseconds
* since the unix epoch (00:00 1st January 1970). That is, pts=0
* in the stream was captured at this real world time.
- * - encoding: Set by user.
- * - decoding: Unused.
+ * - muxing : Set by user.
+ * - demuxing: Unused.
*/
int64_t start_time_realtime;
/**
- * decoding: number of frames used to probe fps
+ * demuxing: number of frames used to probe fps
*/
int fps_probe_size;
/**
* Error recognition; higher values will detect more errors but may
* misdetect some more or less valid parts as errors.
- * - encoding: unused
- * - decoding: Set by user.
+ * - muxing : unused
+ * - demuxing: Set by user.
*/
int error_recognition;
/**
* Custom interrupt callbacks for the I/O layer.
*
- * decoding: set by the user before avformat_open_input().
- * encoding: set by the user before avformat_write_header()
+ * demuxing: set by the user before avformat_open_input().
+ * muxing : set by the user before avformat_write_header()
* (mainly useful for AVFMT_NOFILE formats). The callback
* should also be passed to avio_open2() if it's used to
* open the file.
--
1.8.0.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
