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)
* commit 'e10659244782b26061e7d52c06437de32a43a7af':
  qtrle: add more checks against pixel_ptr being negative.

Conflicts:
libavcodec/qtrle.c

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

Simple merge