[FFmpeg-cvslog] Merge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 20:40:31 2014 +0100| [0a4311dee55b3ac56282505f3f6fbbb63b8a7be1] | committer: Michael Niedermayer

Merge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee'

* commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee':
  rpza: use fixed-width int types

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

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