diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 15:34:35 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 15:34:43 +0400 |
commit | 5e6be52bacb907492f71f7d57978fe10cb278c4c (patch) | |
tree | ca2186d0ea73df4fb8cb8faf9010cc88ff2aa31b /libavcodec/avcodec.h | |
parent | 57123dc67e7768d31e394a9b97bb26831b63bc24 (diff) | |
parent | b19a5e51981be5b69cf550a3bc17fe5300d0dbc9 (diff) |
Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'
* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
lavc: improve AVCodecContext.delay doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b02dadfcaf..7eda8bcdc8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1363,12 +1363,17 @@ typedef struct AVCodecContext { * encoded input. * * Audio: - * For encoding, this is the number of "priming" samples added to the - * beginning of the stream. The decoded output will be delayed by this - * many samples relative to the input to the encoder. Note that this - * field is purely informational and does not directly affect the pts - * output by the encoder, which should always be based on the actual - * presentation time, including any delay. + * For encoding, this is the number of "priming" samples added by the + * encoder to the beginning of the stream. The decoded output will be + * delayed by this many samples relative to the input to the encoder (or + * more, if the decoder adds its own padding). + * The timestamps on the output packets are adjusted by the encoder so + * that they always refer to the first sample of the data actually + * contained in the packet, including any added padding. + * E.g. if the timebase is 1/samplerate and the timestamp of the first + * input sample is 0, the timestamp of the first output packet will be + * -delay. + * * For decoding, this is the number of samples the decoder needs to * output before the decoder's output is valid. When seeking, you should * start decoding this many samples prior to your desired seek point. |