diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 10:47:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 10:47:43 +0200 |
| commit | 945c7e399af230d9fde6df641f13a11dfc5d4954 (patch) | |
| tree | c88eba40bf04ced8c03fc6a7c5ae98e8ac2fa921 /libavutil | |
| parent | 3e0c78bac63c213649c3e8c2fa49e9f3c9848d5a (diff) | |
| parent | 38e15df1489d86c016515223ee693e7d0326c56a (diff) | |
| download | ffmpeg-945c7e399af230d9fde6df641f13a11dfc5d4954.tar.gz | |
Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'
* commit '38e15df1489d86c016515223ee693e7d0326c56a':
avframe: note that linesize is not the usable data size
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index f0a57037e8..1c785ddbe3 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -117,6 +117,9 @@ typedef struct AVFrame { * preference, this is 16 or 32 for modern desktop CPUs. * Some code requires such alignment other code can be slower without * correct alignment, for yet other it makes no difference. + * + * @note The linesize may be larger than the size of usable data -- there + * may be extra padding present for performance reasons. */ int linesize[AV_NUM_DATA_POINTERS]; |