[FFmpeg-cvslog] Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 16 14:10:09 2013 +0100| [aef816f957eec100da42bcbf65e3bfe86df679fa] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aef816f957eec100da42bcbf65e3bfe86df679fa
---