Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 03:45:24 +0000 (04:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 03:45:24 +0000 (04:45 +0100)
* 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>

Trivial merge