diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-25 22:40:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-25 22:40:30 +0200 |
| commit | a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7 (patch) | |
| tree | bee3bf93e6689e119fdc8d8367c6b17d82b3cab7 /libavformat/caf.c | |
| parent | 574bf2ce4ccd4f1a9ca054d5d6a6affe6c507387 (diff) | |
| parent | 503322f97c5a25a020933ed4ab510697d5f5b4af (diff) | |
| download | ffmpeg-a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7.tar.gz | |
Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1
* commit '503322f97c5a25a020933ed4ab510697d5f5b4af':
lzo: Handle integer overflow
Conflicts:
libavutil/lzo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/caf.c')
0 files changed, 0 insertions, 0 deletions