[FFmpeg-cvslog] Merge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4
Michael Niedermayer
git at videolan.org
Sat Jan 17 23:06:56 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 22:56:52 2015 +0100| [cc598bf7dc8a4b0970b5c654de33706c03dac611] | committer: Michael Niedermayer
Merge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4
* commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05':
segment: Fix the failure paths
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc598bf7dc8a4b0970b5c654de33706c03dac611
---
More information about the ffmpeg-cvslog
mailing list