[FFmpeg-cvslog] Merge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 15:02:33 2014 +0200| [58e2d529b3df2fda710d8ed684a7d2aafad9b5d0] | committer: Michael Niedermayer

Merge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1

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

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

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