diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:09:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:12:51 +0100 |
| commit | 8af7774c7aca6f3b595d0417b92f543ce0c7b537 (patch) | |
| tree | 32551417d79c0bf387eeb3e3d9e214d5d3c8ac36 /ffmpeg.h | |
| parent | fe3808eddee81ce4712d1e729fa6fe619f1685c8 (diff) | |
| parent | 3c8ea9d4a74fd4d7493d40c818ca64ee492709f3 (diff) | |
| download | ffmpeg-8af7774c7aca6f3b595d0417b92f543ce0c7b537.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>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions