[FFmpeg-cvslog] Merge commit 'b3f04657368a32a9903406395f865e230b1de348'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  7 22:15:45 2015 +0100| [2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee] | committer: Michael Niedermayer

Merge commit 'b3f04657368a32a9903406395f865e230b1de348'

* commit 'b3f04657368a32a9903406395f865e230b1de348':
  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=2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee
---