diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-04-11 19:47:51 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-04-22 09:44:40 +0400 |
commit | b19a5e51981be5b69cf550a3bc17fe5300d0dbc9 (patch) | |
tree | cd1e3cb6985eeb90a255aaf5e616065638b79991 /libavcodec/avcodec.h | |
parent | a4ed995cabf220029f1d0e185a6fb45eed7b4091 (diff) |
lavc: improve AVCodecContext.delay doxy
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 223293136d..a90669dabd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1208,12 +1208,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. |