Merge commit 'b3f04657368a32a9903406395f865e230b1de348'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Jan 2015 21:15:45 +0000 (22:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Jan 2015 21:15:45 +0000 (22:15 +0100)
commit2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee
treeea6297f44cdb93006755af33888e70ac976f9143
parent86e7d20ac2e7cfd6385f84e78117058c1ea0882f
parentb3f04657368a32a9903406395f865e230b1de348
Merge commit 'b3f04657368a32a9903406395f865e230b1de348'

* commit 'b3f04657368a32a9903406395f865e230b1de348':
  segment: Fix the failure paths

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/segment.c