diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 15:53:55 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 15:54:21 +0400 |
commit | 6a72260e6baf38403c8c26d010425f52dea7817a (patch) | |
tree | 01e165470e429be6a7ffac55b943d86f954b9989 /libavformat/avformat.h | |
parent | bc2e39c4cc35e8b08ca2ba45496ab3048ae7a426 (diff) | |
parent | a738540366c9b114949b7914c0d08e2c28982cfb (diff) |
Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'
* commit 'a738540366c9b114949b7914c0d08e2c28982cfb':
lavf: properly document the distinction between flags and ctx_flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r-- | libavformat/avformat.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7d2db6a3a0..d09745acb8 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1175,7 +1175,11 @@ typedef struct AVFormatContext { AVIOContext *pb; /* stream info */ - int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */ + /** + * Flags signalling stream properties. A combination of AVFMTCTX_*. + * Set by libavformat. + */ + int ctx_flags; /** * Number of elements in AVFormatContext.streams. @@ -1233,6 +1237,10 @@ typedef struct AVFormatContext { unsigned int packet_size; int max_delay; + /** + * Flags modifying the (de)muxer behaviour. A combination of AVFMT_FLAG_*. + * Set by the user before avformat_open_input() / avformat_write_header(). + */ int flags; #define AVFMT_FLAG_GENPTS 0x0001 ///< Generate missing pts even if it requires parsing future frames. #define AVFMT_FLAG_IGNIDX 0x0002 ///< Ignore index. |