aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-02-20 16:52:27 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-02-25 11:49:41 -0500
commit7600e5c5aa1d48c781f1ed363b754c3a0a631eb7 (patch)
treea5895cd69e51be6a1948df961e05581eb886d2f6 /libavcodec
parent6c4c27adb61b2881a94ce5c7d97ee1c8adadb5fe (diff)
downloadffmpeg-7600e5c5aa1d48c781f1ed363b754c3a0a631eb7.tar.gz
avcodec: document the use of AVCodecContext.delay for audio encoders
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7128a83148..d1df5b4168 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1315,8 +1315,20 @@ typedef struct AVCodecContext {
int frame_number; ///< audio or video frame number
/**
- * Number of frames the decoded output will be delayed relative to
- * the encoded input.
+ * Encoder delay.
+ *
+ * Video:
+ * Number of frames the decoded output will be delayed relative to the
+ * encoded input.
+ *
+ * Audio:
+ * Number of "priming" samples added to the beginning of the stream
+ * during encoding. 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.
+ *
* - encoding: Set by libavcodec.
* - decoding: unused
*/