* 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:cf5ab8b6f7See:ad438f450bSee:67607e20e8Merged-by: Michael Niedermayer <michaelni@gmx.at>
4.4 KiB
4.4 KiB