Merge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:02:33 +0000 (15:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:02:54 +0000 (15:02 +0200)
commit58e2d529b3df2fda710d8ed684a7d2aafad9b5d0
tree9d14ed4a40a05b6279fcd193fad7e8086f24502e
parentb9550ea116174de22ec2a9911cfc92f0213e51ef
parent7e513d85e80d730718695d09fcaf0295ae24699e
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@gmx.at>
libavcodec/h264.c