diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 12:37:14 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 12:38:32 +0400 |
| commit | fff526230148b3a67c04c328eecb16efac654e68 (patch) | |
| tree | 90dd02d5a13abc983cb8a6ac465ab5340b421f13 /doc | |
| parent | cc6cc84bc4e009b08ae2f4c2206920e2963adc52 (diff) | |
| parent | 1155fd02ae7bac215acab316e847c6bb25f74fc3 (diff) | |
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 'doc')
| -rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index c9464d8e95..0f6aed3d9b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-xx-xx - xxxxxxx - lavu 53.05.0 - frame.h + Add av_frame_copy() for copying the frame data. + 2014-02-xx - xxxxxxx - lswr 0.18.100 - swresample.h Add swr_is_initialized() for checking whether a resample context is initialized. |