Commit 6bd05ed8 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '792e4c21'

* commit '792e4c21':
  xbm: use av_frame_free on close

Conflicts:
	libavcodec/xbmenc.c

No change as the buggy code is not part of FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8a8472dd 792e4c21
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment