* commit '38e15df1489d86c016515223ee693e7d0326c56a': avframe: note that linesize is not the usable data size Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>