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)
commit6f5f0671f3d6db98551822728d413c367e52c377
tree8ee40fb5e0ae460d673ae1d5983486660a898a14
parent9ba38e62734ed2f8bd092f9eab9e6f1c017ee2e0
parent7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6
Merge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'

* commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6':
  qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro

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