* commit '338ed3ed33c412c2828446c4e2a76949161fec6a': ffv1: Pass correct pointers to av_free() Conflicts: libavcodec/ffv1.c See: a3963cc8ec Merged-by: Michael Niedermayer <michaelni@gmx.at>
a3963cc8ec