FFmpeg/libavformat
Michael Niedermayer 2a741baeff Merge commit 'b3f04657368a32a9903406395f865e230b1de348'
* commit 'b3f04657368a32a9903406395f865e230b1de348':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 22:15:45 +01:00
..
2014-12-18 00:10:35 +01:00
2015-01-05 01:45:49 +01:00
2014-12-18 00:10:35 +01:00
2014-12-23 16:32:26 +01:00
2014-12-09 19:58:56 +01:00
2014-12-18 00:10:35 +01:00
2015-01-06 16:39:52 +01:00
2015-01-05 01:45:49 +01:00
2014-12-18 00:10:35 +01:00
2014-11-06 09:05:37 +01:00
2014-12-18 23:27:07 +01:00
2014-12-18 23:27:07 +01:00
2014-12-02 11:40:01 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2015-01-05 01:45:49 +01:00
2014-12-18 00:10:35 +01:00