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

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