ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Nov 21 21:30:01 2014 +0100| [15ed7ca437a89796759390956f117555e703043e] | committer: Michael Niedermayer
Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6' * commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6': xwma: Do not leak on failure path Conflicts: libavformat/xwma.c See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15ed7ca437a89796759390956f117555e703043e --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog