diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 09:37:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 09:38:32 +0100 |
| commit | fff526230148b3a67c04c328eecb16efac654e68 (patch) | |
| tree | 90dd02d5a13abc983cb8a6ac465ab5340b421f13 /ffmpeg.h | |
| parent | cc6cc84bc4e009b08ae2f4c2206920e2963adc52 (diff) | |
| parent | 1155fd02ae7bac215acab316e847c6bb25f74fc3 (diff) | |
| download | ffmpeg-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 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions