* commit '8dca0877':
  mpegts: Return proper error code on invalid input data

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