Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 08:37:14 +0000 (09:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 08:38:32 +0000 (09:38 +0100)
commitfff526230148b3a67c04c328eecb16efac654e68
tree90dd02d5a13abc983cb8a6ac465ab5340b421f13
parentcc6cc84bc4e009b08ae2f4c2206920e2963adc52
parent1155fd02ae7bac215acab316e847c6bb25f74fc3
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>
doc/APIchanges
libavutil/frame.c
libavutil/frame.h
libavutil/version.h