[FFmpeg-cvslog] Merge commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 14 13:14:54 2013 +0100| [7f8846405e8adb0d84c62226839a2995e4e89202] | committer: Michael Niedermayer

Merge commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5' into release/1.1

* 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 at gmx.at>

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