[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 29 12:03:59 2013 +0200| [a3e9f4c32a92f317ccbf038036f8aa12d2467428] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmapro: check num_vec_coeffs against the actual available buffer

Conflicts:
	libavcodec/wmaprodec.c

The check is replaced by an assert.

See: b21ba20cc83c80fe56192fee3626a8087f37d806

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

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