diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:02:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:02:54 +0200 |
| commit | 58e2d529b3df2fda710d8ed684a7d2aafad9b5d0 (patch) | |
| tree | 9d14ed4a40a05b6279fcd193fad7e8086f24502e /libavutil/parseutils.c | |
| parent | b9550ea116174de22ec2a9911cfc92f0213e51ef (diff) | |
| parent | 7e513d85e80d730718695d09fcaf0295ae24699e (diff) | |
| download | ffmpeg-58e2d529b3df2fda710d8ed684a7d2aafad9b5d0.tar.gz | |
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>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions