Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:11:14 +0000 (15:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:16:51 +0000 (15:16 +0100)
* 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@gmx.at>
1  2 
cmdutils.c
libavcodec/msrledec.c

diff --cc cmdutils.c
Simple merge
Simple merge