aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/frame.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-24 09:37:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-24 09:38:32 +0100
commitfff526230148b3a67c04c328eecb16efac654e68 (patch)
tree90dd02d5a13abc983cb8a6ac465ab5340b421f13 /libavutil/frame.h
parentcc6cc84bc4e009b08ae2f4c2206920e2963adc52 (diff)
parent1155fd02ae7bac215acab316e847c6bb25f74fc3 (diff)
downloadffmpeg-fff526230148b3a67c04c328eecb16efac654e68.tar.gz
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>
Diffstat (limited to 'libavutil/frame.h')
-rw-r--r--libavutil/frame.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h
index b423f67996..0cb5fb72ae 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -674,6 +674,19 @@ int av_frame_is_writable(AVFrame *frame);
int av_frame_make_writable(AVFrame *frame);
/**
+ * Copy the frame data from src to dst.
+ *
+ * This function does not allocate anything, dst must be already initialized and
+ * allocated with the same parameters as src.
+ *
+ * This function only copies the frame data (i.e. the contents of the data /
+ * extended data arrays), not any other properties.
+ *
+ * @return >= 0 on success, a negative AVERROR on error.
+ */
+int av_frame_copy(AVFrame *dst, const AVFrame *src);
+
+/**
* Copy only "metadata" fields from src to dst.
*
* Metadata for the purpose of this function are those fields that do not affect