-
Michael Niedermayer authored
* commit '3c8ea9d4': 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: cf5ab8b6 See: ad438f45 See: 67607e20Merged-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8af7774c) Author of the merged code: Anton Khirnov Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
dcb91e3d