diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:09:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:31:57 +0100 |
| commit | dcb91e3dfe077c3ac0717b24288834d851312e04 (patch) | |
| tree | 53951ccfd471f0a81fb1b7452006d4bb25403ae2 /libavcodec/cookdata.h | |
| parent | bfe4aa892a53a7586b5e51211171e61c4b5c461c (diff) | |
| download | ffmpeg-dcb91e3dfe077c3ac0717b24288834d851312e04.tar.gz | |
Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'
* commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3':
vmnc: use the AVFrame API properly.
xan: use the AVFrame API properly.
xxan: use the AVFrame API properly.
zerocodec: use the AVFrame API properly.
Conflicts:
libavcodec/vmnc.c
libavcodec/xan.c
libavcodec/xxan.c
See: cf5ab8b6f71699a48a6384d5e5779630b4be7b56
See: ad438f450b83882a1277a79c1c3d6dfe55573b1c
See: 67607e20e882eb5639a4e9099caecb52a863ab68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8af7774c7aca6f3b595d0417b92f543ce0c7b537)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cookdata.h')
0 files changed, 0 insertions, 0 deletions