[FFmpeg-cvslog] Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 11 01:59:14 2015 +0100| [b61170f51d2e4178b3e3e7f2961d4d191b7896e2] | committer: Michael Niedermayer

Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'

* commit '1509c018bd5b054a2354e20021ccbac9c934d213':
  mpegts: relax restrictions on matching the packet start in read_header

Conflicts:
	libavformat/mpegts.c

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

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