diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:47:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:48:24 +0200 |
| commit | 459a84ada3b7e0bac3a0ea7360e83cc87f625d31 (patch) | |
| tree | c14a664ad595d9ec654c162f208419c49daa8f45 /tools/zmqshell.py | |
| parent | 35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c (diff) | |
| parent | e912b0777b24133df27836b6c529faa89af588dc (diff) | |
| download | ffmpeg-459a84ada3b7e0bac3a0ea7360e83cc87f625d31.tar.gz | |
Merge commit 'e912b0777b24133df27836b6c529faa89af588dc' into release/2.2
* commit 'e912b0777b24133df27836b6c529faa89af588dc':
proresenc: Report buffer overflow
Conflicts:
libavcodec/proresenc_kostya.c
See: 1ad1723c24cd2683df6d00a83b6f28d3ff45fb96
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions