-
Michael Niedermayer authored
* qatar/master: mpegvideo_enc: use the AVFrame API properly. ffv1: use the AVFrame API properly. jpegls: use the AVFrame API properly. huffyuv: use the AVFrame API properly. Conflicts: libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Changes to ffv1 are more redone than merged due to them being based on an ancient codebase and a good part of that having being done already as well. Merged-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit be1e6e75) Conflicts: libavcodec/ffv1enc.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c Author of the merged code: Anton Khirnov
345e2a2b