[FFmpeg-cvslog] Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'

Michael Niedermayer git at videolan.org
Mon Feb 24 09:51:52 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 09:37:14 2014 +0100| [fff526230148b3a67c04c328eecb16efac654e68] | committer: Michael Niedermayer

Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'

* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
  frame: add a convenience function for copying AVFrame data

Conflicts:
	doc/APIchanges
	libavutil/frame.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fff526230148b3a67c04c328eecb16efac654e68
---





More information about the ffmpeg-cvslog mailing list