diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 20:11:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 20:11:31 +0200 |
| commit | e8a2f8cc1209e836bbf7bd42d1087d3154903555 (patch) | |
| tree | 4b5d420d2c7caa62e0264f187ace3587d1690ad5 /libavdevice/Makefile | |
| parent | 43b769b0c4f438d3f261d53f7fbd23e28606e78a (diff) | |
| parent | 58b68e4fdea22e22178e237bda950b09cc6f363a (diff) | |
| download | ffmpeg-e8a2f8cc1209e836bbf7bd42d1087d3154903555.tar.gz | |
Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'
* commit '58b68e4fdea22e22178e237bda950b09cc6f363a':
proresenc: Report buffer overflow
Conflicts:
libavcodec/proresenc_kostya.c
See: 52b81ff4635c077b2bc8b8d3637d933b6629d803
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/Makefile')
0 files changed, 0 insertions, 0 deletions