[FFmpeg-cvslog] Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 02:33:03 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:25:52 2015 +0100| [dc84cf241cccf440dbad2e3bf31784be7ff1d0f6] | committer: Michael Niedermayer
Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
* commit '32701252af65014bb68194bb61d67ec1882ae75d':
xwma: Do not leak on failure path
Conflicts:
libavformat/xwma.c
See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc84cf241cccf440dbad2e3bf31784be7ff1d0f6
---
More information about the ffmpeg-cvslog
mailing list