Merge commit '3c8ea9d4'
* 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>
Showing
Please
register
or
sign in
to comment