[FFmpeg-cvslog] Merge commit '8883b5f85bfe35509633bc590d19b6a1b495690e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  7 03:09:32 2014 +0100| [c9fef27deb992066c27255e22bb906015858a098] | committer: Michael Niedermayer

Merge commit '8883b5f85bfe35509633bc590d19b6a1b495690e' into release/1.1

* commit '8883b5f85bfe35509633bc590d19b6a1b495690e':
  h264: Fix a typo from the previous commit
  h264: Lower bound check for slice offsets
  Add missing header to fix compilation after d2a0654
  Prepare for 9.12 RELEASE
  configure: Add missing dependency of Snow decoder on videodsp
  rpza: limit the number of blocks to the total remaining blocks in the frame

Conflicts:
	RELEASE

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

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