diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:06:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:07:16 +0200 |
| commit | 3ffa38580190f56d255bca2449b27720b6c18d60 (patch) | |
| tree | e71bbaa173192593a566c4f76802f858fe82f7f2 /cmdutils.c | |
| parent | 0762152f7af6cd93bc8f504d5503723500c3f369 (diff) | |
| parent | 76d4c62734fbb8a9f497712812f30ff5c27e787f (diff) | |
| download | ffmpeg-3ffa38580190f56d255bca2449b27720b6c18d60.tar.gz | |
Merge commit '76d4c62734fbb8a9f497712812f30ff5c27e787f'
* commit '76d4c62734fbb8a9f497712812f30ff5c27e787f':
webp: Make sure enough bytes are available
Conflicts:
libavcodec/webp.c
See: 0762152f7af6cd93bc8f504d5503723500c3f369
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions