[FFmpeg-cvslog] Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 13:49:37 2013 +0100| [9ba38e62734ed2f8bd092f9eab9e6f1c017ee2e0] | committer: Michael Niedermayer

Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'

* commit 'e10659244782b26061e7d52c06437de32a43a7af':
  qtrle: add more checks against pixel_ptr being negative.

Conflicts:
	libavcodec/qtrle.c

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

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