Michael Niedermayer fff5262301 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@gmx.at>

2014-02-24 09:38:32 +01:00

22 KiB

Raw Blame History

View Raw