[FFmpeg-cvslog] Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'
Michael Niedermayer
git at videolan.org
Fri Mar 28 04:46:46 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 04:45:24 2014 +0100| [6bd05ed8bb3010322a9285a29e0ea8b0934b63e9] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bd05ed8bb3010322a9285a29e0ea8b0934b63e9
---
More information about the ffmpeg-cvslog
mailing list