diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:00:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:00:51 +0200 |
| commit | 8401ed651b2c6b089ebb6d5afbf05e662dfbf87e (patch) | |
| tree | 322928cb3f55ac505845e80fcc15f82be4d37695 /tests/ref/seek/vsynth2-msmpeg4 | |
| parent | fcaf78f5f94130471dcbd9fa63e8363ce2fdefe0 (diff) | |
| parent | ea1806ce650f0502dd25939c335b9216fa4a955f (diff) | |
| download | ffmpeg-8401ed651b2c6b089ebb6d5afbf05e662dfbf87e.tar.gz | |
Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1
* commit 'ea1806ce650f0502dd25939c335b9216fa4a955f':
sgidec: fix buffer size check in expand_rle_row()
Conflicts:
libavcodec/sgidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/seek/vsynth2-msmpeg4')
0 files changed, 0 insertions, 0 deletions