[FFmpeg-cvslog] Merge commit '2c1d84499bfe06d75e9160b824eeffd9f5587337' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 18:39:02 2014 +0100| [5640ea43d7202e6bc6bc032079f66456323d1008] | committer: Michael Niedermayer

Merge commit '2c1d84499bfe06d75e9160b824eeffd9f5587337' into release/0.10

* commit '2c1d84499bfe06d75e9160b824eeffd9f5587337':
  lagarith: pad RGB buffer by 1 byte.
  truemotion1: check the header size
  shorten: pad the internal bitstream buffer
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()
  h264: Fix a typo from the previous commit
  h264: Lower bound check for slice offsets
  rpza: limit the number of blocks to the total remaining blocks in the frame

Conflicts:
	libavcodec/lagarith.c

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

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