diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 14:40:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 14:43:04 +0100 |
| commit | e86cd37a7026d277e81413cbdde06556742791bb (patch) | |
| tree | 46947604056a3e93030aea1aaa2c64ee7259a31a /libavformat/webvttenc.c | |
| parent | 80d44190c4d909e9685d04bcde693da3e2441dfd (diff) | |
| parent | f4a8a0080537484154bb74e08ec76cbcbd25484b (diff) | |
| download | ffmpeg-e86cd37a7026d277e81413cbdde06556742791bb.tar.gz | |
Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'
* commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b':
sgidec: fix buffer size check in expand_rle_row()
Conflicts:
libavcodec/sgidec.c
See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttenc.c')
0 files changed, 0 insertions, 0 deletions