diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-16 14:10:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-16 14:10:09 +0100 |
| commit | aef816f957eec100da42bcbf65e3bfe86df679fa (patch) | |
| tree | 15bdbdde9fa060b95e64be2c628ed17efbb15530 /libavformat/utils.c | |
| parent | e4e4add0e3ba7d8ca8ed9135288da910270d2ea3 (diff) | |
| parent | ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6 (diff) | |
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
Conflicts:
libavformat/flacdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions