RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a' 

* commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a':
  lavf: document that passing valid timestamps to muxers is now mandatory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2015-11-22 17:16:13 +00:00
parent cde68661bf 21ab6fd01b
commit 2bf93dfd96
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/avformat.h
View File

@ -2295,10 +2295,17 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options);
* <br> * <br>
* Packet's @ref AVPacket.stream_index "stream_index" field must be * Packet's @ref AVPacket.stream_index "stream_index" field must be
* set to the index of the corresponding stream in @ref * set to the index of the corresponding stream in @ref
* AVFormatContext.streams "s->streams". It is very strongly * AVFormatContext.streams "s->streams".
* recommended that timing information (@ref AVPacket.pts "pts", @ref * <br>
* AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to * The timestamps (@ref AVPacket.pts "pts", @ref AVPacket.dts "dts")
* correct values. * must be set to correct values in the stream's timebase (unless the
* output format is flagged with the AVFMT_NOTIMESTAMPS flag, then
* they can be set to AV_NOPTS_VALUE).
* The dts for subsequent packets passed to this function must be strictly
* increasing when compared in their respective timebases (unless the
* output format is flagged with the AVFMT_TS_NONSTRICT, then they
* merely have to be nondecreasing). @ref AVPacket.duration
* "duration") should also be set if known.
* @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
* *
* @see av_interleaved_write_frame() * @see av_interleaved_write_frame()
@ -2328,10 +2335,16 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
* <br> * <br>
* Packet's @ref AVPacket.stream_index "stream_index" field must be * Packet's @ref AVPacket.stream_index "stream_index" field must be
* set to the index of the corresponding stream in @ref * set to the index of the corresponding stream in @ref
* AVFormatContext.streams "s->streams". It is very strongly * AVFormatContext.streams "s->streams".
* recommended that timing information (@ref AVPacket.pts "pts", @ref * <br>
* AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to * The timestamps (@ref AVPacket.pts "pts", @ref AVPacket.dts "dts")
* correct values. * must be set to correct values in the stream's timebase (unless the
* output format is flagged with the AVFMT_NOTIMESTAMPS flag, then
* they can be set to AV_NOPTS_VALUE).
* The dts for subsequent packets in one stream must be strictly
* increasing (unless the output format is flagged with the
* AVFMT_TS_NONSTRICT, then they merely have to be nondecreasing).
* @ref AVPacket.duration "duration") should also be set if known.
* *
* @return 0 on success, a negative AVERROR on error. Libavformat will always * @return 0 on success, a negative AVERROR on error. Libavformat will always
* take care of freeing the packet, even if this function fails. * take care of freeing the packet, even if this function fails.