* commit 'ca80e158':
  mpegts: Forward error codes in various functions

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