[FFmpeg-cvslog] Merge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 15:45:05 2013 +0100| [92b238715929a26d77e99a18fe5996bcb5796149] | committer: Michael Niedermayer

Merge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'

* commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef':
  truemotion2: return meaningful error codes.
  tscc: remove some pointless comments and empty lines.
  tscc: return meaningful error codes.
  loco: cosmetics, reformat

Conflicts:
	libavcodec/truemotion2.c
	libavcodec/tscc.c

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

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