[FFmpeg-cvslog] Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 20:34:28 2014 +0200| [d123d9abef52931f54701e5fb0ed569416258f75] | committer: Michael Niedermayer

Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'

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

Conflicts:
	libavformat/mpegtsenc.c

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

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