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>

diff --cc libavutil/frame.h
index f0a57037e8cc7f7fa6be91f13608f659f7d15d30,b0676e7f58c602d514af4ba5b912a504ff92a99f..1c785ddbe3ef07d2f53dbc010b27102889656df7
--- 1/libavutil/frame.h
--- 2/libavutil/frame.h
+++ b/libavutil/frame.h
@@@ -113,10 -85,8 +113,13 @@@ typedef struct AVFrame 
       * For audio, only linesize[0] may be set. For planar audio, each channel
       * plane must be the same size.
       *
 +     * For video the linesizes should be multiplies of the CPUs alignment
 +     * 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];