[FFmpeg-cvslog] Merge commit '7f33a24e824c6d20cb941e6b20c5382becfbc923' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 01:37:59 2014 +0200| [69db5f2779f84c8070e505cf2a26a3d46728a6db] | committer: Michael Niedermayer

Merge commit '7f33a24e824c6d20cb941e6b20c5382becfbc923' into release/0.10

* commit '7f33a24e824c6d20cb941e6b20c5382becfbc923':
  h264: check that execute_decode_slices() is not called too many times

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

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