[FFmpeg-cvslog] Merge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 17:34:57 2014 +0200| [293124cae80e7ea8ad4d95539ff605fb12aa9516] | committer: Michael Niedermayer

Merge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'

* commit '7ab551f9fd9a63586649a7df8790ddaeac55420f':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
	libavcodec/h264_sei.c

Not merged, as this would remove 2 bitstream compliance checks.
The specification does not allow the bitstream to end in the middle
of these variable length elements and we have no samples which
have such non compliant truncation either so its better to error
out. Which is simpler as well

This issue also has been fixed long ago
See: 9decfc17bb76da34734296048d390b176abf404c

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

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