diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 18:18:25 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 19:49:17 +0200 |
commit | ac293b66851f6c4461eab03ca91af59d5ee4e02e (patch) | |
tree | 4bcf9e474aaec1e346c368660b52e4630059e380 /libavformat/avformat.h | |
parent | 88514378bac99872265dad28072fb30160b26bfa (diff) | |
parent | 194be1f43ea391eb986732707435176e579265aa (diff) |
Merge commit '194be1f43ea391eb986732707435176e579265aa'
* commit '194be1f43ea391eb986732707435176e579265aa':
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r-- | libavformat/avformat.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 16c225479d..a2cea10180 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -800,9 +800,12 @@ typedef struct AVStream { * of which frame timestamps are represented. * * decoding: set by libavformat - * encoding: set by libavformat in avformat_write_header. The muxer may use the - * user-provided value of @ref AVCodecContext.time_base "codec->time_base" - * as a hint. + * encoding: May be set by the caller before avformat_write_header() to + * provide a hint to the muxer about the desired timebase. In + * avformat_write_header(), the muxer will overwrite this field + * with the timebase that will actually be used for the timestamps + * written into the file (which may or may not be related to the + * user-provided one, depending on the format). */ AVRational time_base; |