[FFmpeg-cvslog] Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  7 00:38:25 2013 +0100| [07f22d0b49332d9616ce5ff94679da5a01c19b0d] | committer: Michael Niedermayer

Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'

* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
  fraps: return meaningful error codes.
  kgv1dec: return meaningful error codes.
  kmvc: return meaningful error codes.
  wnv1: return meaningful error codes.
  dpx: return meaningful error codes.
  truemotion1: return meaningful error codes
  pnm: return meaningful error codes.

Conflicts:
	libavcodec/dpx.c
	libavcodec/fraps.c
	libavcodec/kmvc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c

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

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