[FFmpeg-cvslog] Merge commit '9dbbda235d93d628777b986e502213f1ed390973'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  7 01:24:32 2013 +0100| [501db2f32babff8e2851ffd7aeb6bcb1ecb47d19] | committer: Michael Niedermayer

Merge commit '9dbbda235d93d628777b986e502213f1ed390973'

* commit '9dbbda235d93d628777b986e502213f1ed390973':
  vb: return meaningful error codes.
  ptx: return meaningful error codes.
  tiff: return meaningful error codes.
  vqavideo: return meaningful error codes.
  mss2: return meaningful error codes.
  v210dec: return meaningful error codes
  indeo2: cosmetics, reformat

Conflicts:
	libavcodec/indeo2.c
	libavcodec/tiff.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vqavideo.c

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

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