[FFmpeg-cvslog] Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 18 13:30:20 2014 +0100| [7ae5cadb0ace6e76640133fa9e6eeca294e2d7bf] | committer: Michael Niedermayer

Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'

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

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ae5cadb0ace6e76640133fa9e6eeca294e2d7bf
---