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

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-17 21:20:38 +01:00
parent f3bb5f28d3 2f2b2efd31
commit 6742614c23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/avformat.h
View File

@ -2062,24 +2062,22 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options);
* function. * function.
* *
* @param s media file handle * @param s media file handle
* @param pkt @parblock * @param pkt The packet containing the data to be written. Note that unlike
* The packet containing the data to be written. Note that unlike
* av_interleaved_write_frame(), this function does not take * av_interleaved_write_frame(), this function does not take
* ownership of the packet passed to it (though some muxers may make * ownership of the packet passed to it (though some muxers may make
* an internal reference to the input packet). * an internal reference to the input packet).
* * <br>
* This parameter can be NULL (at any time, not just at the end), in * This parameter can be NULL (at any time, not just at the end), in
* order to immediately flush data buffered within the muxer, for * order to immediately flush data buffered within the muxer, for
* muxers that buffer up data internally before writing it to the * muxers that buffer up data internally before writing it to the
* output. * output.
* * <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". It is very strongly
* recommended that timing information (@ref AVPacket.pts "pts", @ref * recommended that timing information (@ref AVPacket.pts "pts", @ref
* AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
* correct values. * correct values.
* @endparblock
* @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()
@ -2095,26 +2093,24 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
* av_write_frame() instead of this function. * av_write_frame() instead of this function.
* *
* @param s media file handle * @param s media file handle
* @param pkt @parblock * @param pkt The packet containing the data to be written.
* The packet containing the data to be written. * <br>
*
* If the packet is reference-counted, this function will take * If the packet is reference-counted, this function will take
* ownership of this reference and unreference it later when it sees * ownership of this reference and unreference it later when it sees
* fit. * fit.
* The caller must not access the data through this reference after * The caller must not access the data through this reference after
* this function returns. If the packet is not reference-counted, * this function returns. If the packet is not reference-counted,
* libavformat will make a copy. * libavformat will make a copy.
* * <br>
* This parameter can be NULL (at any time, not just at the end), to * This parameter can be NULL (at any time, not just at the end), to
* flush the interleaving queues. * flush the interleaving queues.
* * <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". It is very strongly
* recommended that timing information (@ref AVPacket.pts "pts", @ref * recommended that timing information (@ref AVPacket.pts "pts", @ref
* AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
* correct values. * correct values.
* @endparblock
* *
* @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.