aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-01-07 11:25:04 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-01-07 14:33:16 -0500
commit3f6aa85ed45c2e6d52c2d11fc7f41bf732d10c29 (patch)
tree994e15cb6febb0a2ad7f2df4a99cee2bb74b2a27
parent07837e4158f8cf478f5b270d6027af2b13ca1780 (diff)
downloadffmpeg-3f6aa85ed45c2e6d52c2d11fc7f41bf732d10c29.tar.gz
avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
-rw-r--r--libavcodec/avcodec.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c38bd275b8..c195ad5b18 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -725,10 +725,22 @@ typedef struct RcOverride{
/* Codec can export data for HW decoding (XvMC). */
#define CODEC_CAP_HWACCEL 0x0010
/**
- * Codec has a nonzero delay and needs to be fed with avpkt->data=NULL,
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ * with NULL data. The user can still send NULL data to the public encode
+ * or decode function, but libavcodec will not pass it along to the codec
+ * unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
* avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames. If this is not set, the codec is guaranteed to never be fed
- * with NULL data.
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
*/
#define CODEC_CAP_DELAY 0x0020
/**