Merge commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 12:14:54 +0000 (13:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 12:14:54 +0000 (13:14 +0100)
* commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5':
  msrledec: check bounds before constructing a possibly invalid pointer,
  qtrle: fix the topmost line for 1bit
  aasc: fix output for msrle compression.

Conflicts:
tests/ref/fate/aasc
tests/ref/fate/qtrle-1bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c
libavcodec/msrledec.c
libavcodec/qtrle.c

diff --cc cmdutils.c
Simple merge
Simple merge
Simple merge