Michael Niedermayer 92b2387159 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>

2013-01-14 15:45:05 +01:00

5.7 KiB

Raw Blame History

View Raw