[FFmpeg-cvslog] Merge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 19:30:07 2014 +0200| [330791c2ae2b7a10147add181373c11984c7284b] | committer: Michael Niedermayer

Merge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10

* commit '184c79729d4011f33027bcdc61a63d521017ebc1':
  h264_sei: check SEI size

Conflicts:
	libavcodec/h264_sei.c

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

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