tree 9840561a9acac2da2d0224f15e9b8db858b6b0f4
parent 0fda37cff9470c602fd59366ac4250a9a4eae6b1
parent 4b2e02a4c4a618ac6d03fd38eb7ab0bc09596667
author Michael Niedermayer <michaelni@gmx.at> 1336766531 +0200
committer Michael Niedermayer <michaelni@gmx.at> 1336766531 +0200

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Bump version number for 0.5.8 release.
  Release notes and changelog for 0.5.7
  vqavideo: return error if image size is not a multiple of block size
  motionpixels: Clip YUV values after applying a gradient.
  mjpegbdec: Fix overflow in SOS.
  atrac3: Fix crash in tonal component decoding.
  dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
  dv: Fix null pointer dereference due to ach=0
  dv: check stype
  nsvdec: Propagate errors
  nsvdec: Be more careful with av_malloc().
  nsvdec: Fix use of uninitialized streams.

Conflicts:
	libavcodec/atrac3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>