Merge commit '7f33a24e824c6d20cb941e6b20c5382becfbc923' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:37:59 +0000 (01:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:38:03 +0000 (01:38 +0200)
commit69db5f2779f84c8070e505cf2a26a3d46728a6db
tree916c53d2abb47bd1a5e58fb46031d17ce8375ebd
parent97a5b4ba53a10aa8c5ecf2ccf18c61e6724bebd3
parent7f33a24e824c6d20cb941e6b20c5382becfbc923
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@gmx.at>
libavcodec/h264.c