diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 01:23:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 01:23:24 +0100 |
| commit | f2a84d04331d8179a3cac1adcdef9de1b5c3f1e9 (patch) | |
| tree | 801cf08605e852d9dbc39446b5015b647273d36a /libavcodec/adpcm.c | |
| parent | d08db138e2109725ba2963f152b0a2b1fffded1b (diff) | |
| parent | 8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e (diff) | |
| download | ffmpeg-f2a84d04331d8179a3cac1adcdef9de1b5c3f1e9.tar.gz | |
Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4
* commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e':
rv10: check size of s->mb_width * s->mb_height
Conflicts:
libavcodec/rv10enc.c
See: d08db138e2109725ba2963f152b0a2b1fffded1b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.c')
0 files changed, 0 insertions, 0 deletions