Merge commit 'f844cb9bced3148fca2db5bbb092929526108005' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:36:39 +0000 (17:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:36:39 +0000 (17:36 +0200)
commit70a1182a484402fc893d7fe4530d7bb9d636524a
treefc5d2389e4f6e5a8fadb38c734cc713578054bb8
parent49d597f058a9f3a09d272e711d636f5e6829920e
parentf844cb9bced3148fca2db5bbb092929526108005
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>
libavcodec/atrac3.c
libavcodec/wmaprodec.c
libavformat/flacdec.c
libavformat/iff.c
libavformat/utils.c
libavutil/lzo.c