Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:00:04 +0000 (01:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:01:13 +0000 (01:01 +0100)
commitd30660306ceb070a3d74bca3b4a9f99a09b685dc
tree1b9e692b389a890a3f61be07b388e31e6f64cad3
parent07f22d0b49332d9616ce5ff94679da5a01c19b0d
parent3c6e5a840c45fd3b832e86881602a72e47d46f19
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@gmx.at>
libavcodec/fraps.c
libavcodec/rl2.c