[FFmpeg-cvslog] Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 22:02:03 2015 +0100| [c16896f52551116aa3dda7b60854f0b044913105] | committer: Michael Niedermayer

Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'

* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
  ituh263dec: use macro instead of #if

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

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