[FFmpeg-cvslog] Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2
Michael Niedermayer
git at videolan.org
Wed Jul 30 20:45:43 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 30 20:29:30 2014 +0200| [f02221d65143aa9a5719fa83f159daaa1308b6a0] | committer: Michael Niedermayer
Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2
* commit 'f6b3dce952d66f87883a50d90d6e98416ee397df':
librtmp: Don't free the temp url at the end of rtmp_open
Conflicts:
libavformat/librtmp.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f02221d65143aa9a5719fa83f159daaa1308b6a0
---
More information about the ffmpeg-cvslog
mailing list