Merge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:55:27 +0000 (13:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:55:44 +0000 (13:55 +0100)
* commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6':
  qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro

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

Simple merge