diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 21:37:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 21:38:27 +0200 |
| commit | 4b13ec69c6a23dd25d048bb129fadba131849cf9 (patch) | |
| tree | 623c673e25c0b0a6bcf617527deff7e7ae797b1a /libavformat/avformat.h | |
| parent | 714d9bd6ee2fff97ed14ccf1fc02f031afccce3c (diff) | |
| parent | c9c1265c52910578d3db1a6205c85b91ead0903f (diff) | |
| download | ffmpeg-4b13ec69c6a23dd25d048bb129fadba131849cf9.tar.gz | |
Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'
* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
avformat: update muxing doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8a9e6dc33e..0c3780827e 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -194,7 +194,7 @@ * the @ref AVStream.codec "stream codec context" information, such as the * codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id * "id" and other parameters (e.g. width / height, the pixel or sample format, - * etc.) as known. The @ref AVCodecContext.time_base "codec timebase" should + * etc.) as known. The @ref AVStream.time_base "stream timebase" should * be set to the timebase that the caller desires to use for this stream (note * that the timebase actually used by the muxer can be different, as will be * described later). @@ -218,8 +218,8 @@ * a single muxing context, they should not be mixed). Do note that the timing * information on the packets sent to the muxer must be in the corresponding * AVStream's timebase. That timebase is set by the muxer (in the - * avformat_write_header() step) and may be different from the timebase the - * caller set on the codec context. + * avformat_write_header() step) and may be different from the timebase + * requested by the caller. * * Once all the data has been written, the caller must call av_write_trailer() * to flush any buffered packets and finalize the output file, then close the IO |