diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:32:38 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:32:38 +0200 |
| commit | 97bdb94341ae60630f019f8fa057be9bb35c08c8 (patch) | |
| tree | 7de2d58765d4edeec9cf0c515b49c3c16c82653b | |
| parent | 314e6086315dafc2008839238b0d7b053ce009c4 (diff) | |
| parent | 14634429b915333f3612eaf41db3954222dc4aaf (diff) | |
| download | ffmpeg-97bdb94341ae60630f019f8fa057be9bb35c08c8.tar.gz | |
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'
* commit '14634429b915333f3612eaf41db3954222dc4aaf':
lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -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 c881808dbe..876f1e3ee4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -203,15 +203,15 @@ * avio_open2() or a custom one. * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must * be created with the avformat_new_stream() function. The caller should fill - * the @ref AVStream.codec "stream codec context" information, such as the - * codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id + * the @ref AVStream.codecpar "stream codec parameters" information, such as the + * codec @ref AVCodecParameters.codec_type "type", @ref AVCodecParameters.codec_id * "id" and other parameters (e.g. width / height, the pixel or sample format, * 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). * - It is advised to manually initialize only the relevant fields in - * AVCodecContext, rather than using @ref avcodec_copy_context() during + * AVCodecParameters, rather than using @ref avcodec_parameters_copy() during * remuxing: there is no guarantee that the codec context values remain valid * for both input and output format contexts. * - The caller may fill in additional information, such as @ref |