[FFmpeg-cvslog] Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  7 01:00:04 2013 +0100| [d30660306ceb070a3d74bca3b4a9f99a09b685dc] | committer: Michael Niedermayer

Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'

* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
  rl2: use fixed-width integer types where appropriate
  rl2: return meaningful error codes.
  cljr: return a meaningful error code.
  fraps: cosmetics, reformat

Conflicts:
	libavcodec/fraps.c
	libavcodec/rl2.c

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

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