virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'

Browse Source 
* commit '38e15df1489d86c016515223ee693e7d0326c56a':
  avframe: note that linesize is not the usable data size

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-28 10:47:43 +02:00
parent 3e0c78bac6 38e15df148
commit 945c7e399a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/frame.h
View File

@@ -117,6 +117,9 @@ typedef struct AVFrame {
* preference, this is 16 or 32 for modern desktop CPUs. * preference, this is 16 or 32 for modern desktop CPUs.
* Some code requires such alignment other code can be slower without * Some code requires such alignment other code can be slower without
* correct alignment, for yet other it makes no difference. * 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]; int linesize[AV_NUM_DATA_POINTERS];