diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 17:36:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 17:36:39 +0200 |
| commit | 70a1182a484402fc893d7fe4530d7bb9d636524a (patch) | |
| tree | fc5d2389e4f6e5a8fadb38c734cc713578054bb8 /version.sh | |
| parent | 49d597f058a9f3a09d272e711d636f5e6829920e (diff) | |
| parent | f844cb9bced3148fca2db5bbb092929526108005 (diff) | |
| download | ffmpeg-70a1182a484402fc893d7fe4530d7bb9d636524a.tar.gz | |
Merge commit 'f844cb9bced3148fca2db5bbb092929526108005' into release/0.8
* commit 'f844cb9bced3148fca2db5bbb092929526108005':
iff: validate CMAP palette size
wmaprodec: require block_align to be set.
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
lavf: fix arithmetic overflows in avformat_seek_file()
Conflicts:
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions