[FFmpeg-cvslog] Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 15:11:14 2013 +0100| [ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333] | committer: Michael Niedermayer

Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'

* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177':
  aasc: fix output for msrle compression.
  msrledec: check bounds before constructing a possibly invalid pointer,
  cmdutils: remove ansi from the list of broken codecs.

Conflicts:
	tests/ref/fate/aasc

Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5

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

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