From: Michael Niedermayer Date: Sat, 25 Dec 2010 19:49:15 +0000 (+0000) Subject: Clarify AVFMT_TS_DISCONT and muxers. X-Git-Tag: v0.7b1~1262 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58ec7e00db5a78bb2d18b43b88e340f9c1373efa;p=platform%2Fupstream%2Flibav.git Clarify AVFMT_TS_DISCONT and muxers. Originally committed as revision 26089 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3079b38..e8fb217 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -320,7 +320,7 @@ typedef struct AVFormatParameters { #define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */ #define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */ #define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */ -#define AVFMT_TS_DISCONT 0x0200 /**< Format allows timestamp discontinuities. */ +#define AVFMT_TS_DISCONT 0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */ #define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */ #define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */