mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-23 14:56:44 +00:00
Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'
* commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4': xbm: use av_frame_free on close Conflicts: libavcodec/xbmenc.c No change as the buggy code is not part of FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6bd05ed8bb