[FFmpeg-cvslog] Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'
Michael Niedermayer
git at videolan.org
Sat Sep 28 10:57:04 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 28 10:47:43 2013 +0200| [945c7e399af230d9fde6df641f13a11dfc5d4954] | committer: Michael Niedermayer
Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'
* commit '38e15df1489d86c016515223ee693e7d0326c56a':
avframe: note that linesize is not the usable data size
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=945c7e399af230d9fde6df641f13a11dfc5d4954
---
More information about the ffmpeg-cvslog
mailing list