Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:49:37 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:49:37 +0000 (13:49 +0100)
commit9ba38e62734ed2f8bd092f9eab9e6f1c017ee2e0
tree1699e4558d4012b985dccf33734c7855c881d6d4
parent9748cac5650a24d5b004a861649ab5a8274d5248
parente10659244782b26061e7d52c06437de32a43a7af
Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'

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

Conflicts:
libavcodec/qtrle.c

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