Merge commit '50ec1db6'
* commit '50ec1db6': 4xm: fold last_picture lazy allocation in decode_p_frame Conflicts: libavcodec/4xm.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '50ec1db6': 4xm: fold last_picture lazy allocation in decode_p_frame Conflicts: libavcodec/4xm.c Merged-by:Michael Niedermayer <michaelni@gmx.at>