diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:10:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:10:44 +0200 |
| commit | 5cf794e0c1f7b651de4b1a61a6786fb71e9679b3 (patch) | |
| tree | db09a4fe091885f7c4a86ffe71dab07b4a7f9c5d /libavutil/lzo.h | |
| parent | 5555d2075a26fc778fb8145473100e94d80a00c8 (diff) | |
| parent | d82f188504410fdfa446c5682c128c31bb5851a4 (diff) | |
Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'
* commit 'd82f188504410fdfa446c5682c128c31bb5851a4':
Remove need for padding in av_memcpy_backptr()
Conflicts:
libavutil/lzo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lzo.h')
| -rw-r--r-- | libavutil/lzo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/lzo.h b/libavutil/lzo.h index 14fb62dd7b..60b7065b15 100644 --- a/libavutil/lzo.h +++ b/libavutil/lzo.h @@ -61,7 +61,7 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen); /** * @brief deliberately overlapping memcpy implementation - * @param dst destination buffer; must be padded with 12 additional bytes + * @param dst destination buffer * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0 * @param cnt number of bytes to copy, must be >= 0 * |