Merge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:45:05 +0000 (15:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:45:05 +0000 (15:45 +0100)
commit92b238715929a26d77e99a18fe5996bcb5796149
treeea683bd86b4609f3aa5386980cb5c5f24d426799
parentf9d5bdd0f6526e852ec37528c9b5f97beb71ef07
parentdf9036830b15997a3e9c3f2c632ed98d64f9deef
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@gmx.at>
libavcodec/loco.c
libavcodec/truemotion2.c
libavcodec/tscc.c